From: NeilBrown <neilb@suse.de>
Date: Fri, 9 Dec 2011 03:27:08 +0000 (+1100)
Subject: md/raid1: Allow a failed replacement device to be removed.
X-Git-Tag: next-20111212~39^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cf1b7cc19d6b7336a8c063adb10481a2c1d009b6;p=karo-tx-linux.git

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 5f4045fe6ffe..794ef7024c1e 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1335,6 +1335,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) ||
@@ -1358,6 +1361,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(Replaceable, &rdev->flags);
 		}
 		err = md_integrity_register(mddev);
 	}