md/raid1: Allow a failed replacement device to be removed.
Replacement devices are stored at a different offset, so look
there too.
Signed-off-by: NeilBrown <neilb@suse.de>
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e7768e3..3d9aa0c 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1336,6 +1336,9 @@
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 @@
err = -EBUSY;
p->rdev = rdev;
goto abort;
+ } else {
+ clear_bit(Replacement, &rdev->flags);
+ clear_bit(WantReplacement, &rdev->flags);
}
err = md_integrity_register(mddev);
}
