aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-11-24 16:39:46 +1100
committerNeilBrown <neilb@suse.de>2010-11-24 16:39:46 +1100
commit8f9e0ee38f75d4740daa9e42c8af628d33d19a02 (patch)
tree4e1b3fe1460cd0c71258cfb2f68bb28cf71eeca4
parentc26a44ed1e552aaa1d4ceb71842002d235fe98d7 (diff)
downloadmrst-s0i3-test-8f9e0ee38f75d4740daa9e42c8af628d33d19a02.tar.gz
mrst-s0i3-test-8f9e0ee38f75d4740daa9e42c8af628d33d19a02.tar.xz
mrst-s0i3-test-8f9e0ee38f75d4740daa9e42c8af628d33d19a02.zip
md/raid1: really fix recovery looping when single good device fails.
Commit 4044ba58dd15cb01797c4fd034f39ef4a75f7cc3 supposedly fixed a problem where if a raid1 with just one good device gets a read-error during recovery, the recovery would abort and immediately restart in an infinite loop. However it depended on raid1_remove_disk removing the spare device from the array. But that does not happen in this case. So add a test so that in the 'recovery_disabled' case, the device will be removed. This suitable for any kernel since 2.6.29 which is when recovery_disabled was introduced. Cc: stable@kernel.org Reported-by: Sebastian Färber <faerber@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/raid1.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 45f8324196e..845cf95b612 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1161,6 +1161,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
* is not possible.
*/
if (!test_bit(Faulty, &rdev->flags) &&
+ !mddev->recovery_disabled &&
mddev->degraded < conf->raid_disks) {
err = -EBUSY;
goto abort;