diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-22 07:51:21 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:44:28 -0500 |
commit | e90285e0ba11c1a4a09b8a50d8d5b18e1298d245 (patch) | |
tree | c2a21ae4249b6a41c8324c67c510ae27eff7b137 /drivers/block/drbd/drbd_state.c | |
parent | f399002e68e626e7bc443e6fcab1772704cc197f (diff) |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
-rw-r--r-- | drivers/block/drbd/drbd_state.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
50 | bool conn_all_vols_unconf(struct drbd_tconn *tconn) | 50 | bool conn_all_vols_unconf(struct drbd_tconn *tconn) |
51 | { | 51 | { |
52 | struct drbd_conf *mdev; | 52 | struct drbd_conf *mdev; |
53 | int minor; | 53 | int vnr; |
54 | 54 | ||
55 | idr_for_each_entry(&tconn->volumes, mdev, minor) { | 55 | idr_for_each_entry(&tconn->volumes, mdev, vnr) { |
56 | if (mdev->state.disk != D_DISKLESS || | 56 | if (mdev->state.disk != D_DISKLESS || |
57 | mdev->state.conn != C_STANDALONE || | 57 | mdev->state.conn != C_STANDALONE || |
58 | mdev->state.role != R_SECONDARY) | 58 | mdev->state.role != R_SECONDARY) |
@@ -332,9 +332,9 @@ static void print_state_change(struct drbd_conf *mdev, union drbd_state os, unio | |||
332 | static bool vol_has_primary_peer(struct drbd_tconn *tconn) | 332 | static bool vol_has_primary_peer(struct drbd_tconn *tconn) |
333 | { | 333 | { |
334 | struct drbd_conf *mdev; | 334 | struct drbd_conf *mdev; |
335 | int minor; | 335 | int vnr; |
336 | 336 | ||
337 | idr_for_each_entry(&tconn->volumes, mdev, minor) { | 337 | idr_for_each_entry(&tconn->volumes, mdev, vnr) { |
338 | if (mdev->state.peer == R_PRIMARY) | 338 | if (mdev->state.peer == R_PRIMARY) |
339 | return true; | 339 | return true; |
340 | } | 340 | } |