---

yaml --- r: 107397 b: refs/heads/master c: e542713 h: refs/heads/master i: 107395: 2650f9c v: v3
git-mirror · Jul 29, 2008 · a9122dc · a9122dc
1 parent 6831b94
commit a9122dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df10cfbc4d7ab93260d997df754219d390d62a9d
+refs/heads/master: e542713529e323ff09d7aeb5806cf29f6f160f53
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -5996,7 +5996,8 @@ static int remove_and_add_spares(mddev_t *mddev)
 	if (mddev->degraded) {
 		rdev_for_each(rdev, rtmp, mddev) {
 			if (rdev->raid_disk >= 0 &&
-			    !test_bit(In_sync, &rdev->flags))
+			    !test_bit(In_sync, &rdev->flags) &&
+			    !test_bit(Blocked, &rdev->flags))
 				spares++;
 			if (rdev->raid_disk < 0
 			    && !test_bit(Faulty, &rdev->flags)) {