diff options
| author | Philipp Reisner | 2011-03-22 12:51:21 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:44:28 +0100 |
| commit | e90285e0ba11c1a4a09b8a50d8d5b18e1298d245 (patch) | |
| tree | c2a21ae4249b6a41c8324c67c510ae27eff7b137 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: distribute former syncer_conf settings to disk, connection, and resourc... (diff) | |
| download | kernel-qcow2-linux-e90285e0ba11c1a4a09b8a50d8d5b18e1298d245.tar.gz kernel-qcow2-linux-e90285e0ba11c1a4a09b8a50d8d5b18e1298d245.tar.xz kernel-qcow2-linux-e90285e0ba11c1a4a09b8a50d8d5b18e1298d245.zip | |
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 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; } |