mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 21:04:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

drbd: Fixed conn_lowest_minor

Browse Source 
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>
This commit is contained in:
Philipp Reisner
2011-03-22 12:51:21 +01:00
parent f399002e68
commit e90285e0ba
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/drbd/drbd_main.c
View File

@@ -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

4
drivers/block/drbd/drbd_nl.c
View File

@@ -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);
}

8
drivers/block/drbd/drbd_state.c
View File

@@ -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;
}