From da53d1c1a800427583120b74c0a17cbe8958ad2b Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 19 Mar 2012 12:46:37 +1100
Subject: [PATCH] --- yaml --- r: 292790 b: refs/heads/master c:
 dc10c643e8a8d008fd16dd6706e9e0018eadf8d2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/md/raid10.c | 2 +-
 trunk/drivers/md/raid5.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a83957d40b1d..e408088b8314 100644
--- 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
index 1a19c962f860..f4f3edcdaf8d 100644
--- 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
index 99b2bbf8b5d8..d38d235cc39d 100644
--- 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;