From 77a54477e74467dccc0131ff673904fd80ba9efc Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 23 Dec 2011 10:17:56 +1100 Subject: [PATCH] --- yaml --- r: 280522 b: refs/heads/master c: b014f14c81bc5db4e40e2a4db10998fd79c1c64c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid1.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 955b3bd31e9e..c184705ee973 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f19ccb2fd70deb1f278be5e75076074cfddee46 +refs/heads/master: b014f14c81bc5db4e40e2a4db10998fd79c1c64c diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index e7768e37f36a..3d9aa0c92821 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -1336,6 +1336,9 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) int number = rdev->raid_disk; struct mirror_info *p = conf->mirrors+ number; + if (rdev != p->rdev) + p = conf->mirrors + conf->raid_disks + number; + print_conf(conf); if (rdev == p->rdev) { if (test_bit(In_sync, &rdev->flags) || @@ -1359,6 +1362,9 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) err = -EBUSY; p->rdev = rdev; goto abort; + } else { + clear_bit(Replacement, &rdev->flags); + clear_bit(WantReplacement, &rdev->flags); } err = md_integrity_register(mddev); }