---

yaml --- r: 292790 b: refs/heads/master c: dc10c64 h: refs/heads/master v: v3
git-mirror · Mar 19, 2012 · da53d1c · da53d1c
1 parent 6937762
commit da53d1c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41fe75f60bcd4d698daed3e54bb099227358ce58
+refs/heads/master: dc10c643e8a8d008fd16dd6706e9e0018eadf8d2
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
@@ -1483,7 +1483,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
 		 * very different from resync
 		 */
 		return -EBUSY;
-	if (!enough(conf, -1))
+	if (rdev->saved_raid_disk < 0 && !enough(conf, -1))
 		return -EINVAL;
 
 	if (rdev->raid_disk >= 0)

diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -5361,7 +5361,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)
 	if (mddev->recovery_disabled == conf->recovery_disabled)
 		return -EBUSY;
 
-	if (has_failed(conf))
+	if (rdev->saved_raid_disk < 0 && has_failed(conf))
 		/* no point adding a device */
 		return -EINVAL;