diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
| commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
| tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /drivers/md/multipath.c | |
| parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
| parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 5899246fa37e..a222f516660e 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c @@ -292,17 +292,16 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) return err; } -static int multipath_remove_disk(struct mddev *mddev, int number) +static int multipath_remove_disk(struct mddev *mddev, struct md_rdev *rdev) { struct mpconf *conf = mddev->private; int err = 0; - struct md_rdev *rdev; + int number = rdev->raid_disk; struct multipath_info *p = conf->multipaths + number; print_multipath_conf(conf); - rdev = p->rdev; - if (rdev) { + if (rdev == p->rdev) { if (test_bit(In_sync, &rdev->flags) || atomic_read(&rdev->nr_pending)) { printk(KERN_ERR "hot-remove-disk, slot %d is identified" |