From e90285e0ba11c1a4a09b8a50d8d5b18e1298d245 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Tue, 22 Mar 2011 12:51:21 +0100 Subject: [PATCH] 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 Signed-off-by: Lars Ellenberg --- drivers/block/drbd/drbd_main.c | 12 +++++++----- drivers/block/drbd/drbd_nl.c | 4 ++-- drivers/block/drbd/drbd_state.c | 8 ++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index bdb12723585e..2dfbcfa1a7b2 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -434,7 +434,7 @@ void tl_clear(struct drbd_tconn *tconn) 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 @@ void tl_clear(struct drbd_tconn *tconn) } /* 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 @@ char *drbd_task_to_thread_name(struct drbd_tconn *tconn, struct task_struct *tas 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 18cd2ed4e8ca..d903fb5ea41c 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -326,9 +326,9 @@ int drbd_khelper(struct drbd_conf *mdev, char *cmd) 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 77fad527fb1d..cb08e011c288 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -50,9 +50,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state 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 void print_state_change(struct drbd_conf *mdev, union drbd_state os, unio 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; } -- 2.34.1