drbd: Fixed conn_lowest_minor
It actually returned the lowest volume number. While doing that
renamed a few wrongly named variables.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index bdb1272..2dfbcfa 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -434,7 +434,7 @@
struct drbd_conf *mdev;
struct list_head *le, *tle;
struct drbd_request *r;
- int minor;
+ int vnr;
spin_lock_irq(&tconn->req_lock);
@@ -453,7 +453,7 @@
}
/* 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);
@@ -634,11 +634,13 @@
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
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 18cd2ed..d903fb5 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -326,9 +326,9 @@
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);
}
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 77fad52..cb08e01 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -50,9 +50,9 @@
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)
@@ -332,9 +332,9 @@
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;
}