struct drbd_conf *mdev;
struct list_head *le, *tle;
struct drbd_request *r;
- int minor;
+ int vnr;
spin_lock_irq(&tconn->req_lock);
}
/* ensure bit indicating barrier is required is clear */
- idr_for_each_entry(&tconn->volumes, mdev, minor)
+ idr_for_each_entry(&tconn->volumes, mdev, vnr)
clear_bit(CREATE_BARRIER, &mdev->flags);
spin_unlock_irq(&tconn->req_lock);
int conn_lowest_minor(struct drbd_tconn *tconn)
{
- int minor = 0;
+ int vnr = 0;
+ struct drbd_conf *mdev;
- if (!idr_get_next(&tconn->volumes, &minor))
+ mdev = idr_get_next(&tconn->volumes, &vnr);
+ if (!mdev)
return -1;
- return minor;
+ return mdev_to_minor(mdev);
}
#ifdef CONFIG_SMP
static void conn_md_sync(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor)
+ idr_for_each_entry(&tconn->volumes, mdev, vnr)
drbd_md_sync(mdev);
}
bool conn_all_vols_unconf(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor) {
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
if (mdev->state.disk != D_DISKLESS ||
mdev->state.conn != C_STANDALONE ||
mdev->state.role != R_SECONDARY)
static bool vol_has_primary_peer(struct drbd_tconn *tconn)
{
struct drbd_conf *mdev;
- int minor;
+ int vnr;
- idr_for_each_entry(&tconn->volumes, mdev, minor) {
+ idr_for_each_entry(&tconn->volumes, mdev, vnr) {
if (mdev->state.peer == R_PRIMARY)
return true;
}