2 files changed, 28 insertions, 18 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index be569eb41a93..1c1c562f63dc 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7399,23 +7399,21 @@ static int remove_and_add_spares(struct mddev *mddev)
                         }
                 }
 
-        if (mddev->degraded) {
-                list_for_each_entry(rdev, &mddev->disks, same_set) {
-                        if (rdev->raid_disk >= 0 &&
-                            !test_bit(In_sync, &rdev->flags) &&
-                            !test_bit(Faulty, &rdev->flags))
+        list_for_each_entry(rdev, &mddev->disks, same_set) {
+                if (rdev->raid_disk >= 0 &&
+                    !test_bit(In_sync, &rdev->flags) &&
+                    !test_bit(Faulty, &rdev->flags))
+                        spares++;
+                if (rdev->raid_disk < 0
+                    && !test_bit(Faulty, &rdev->flags)) {
+                        rdev->recovery_offset = 0;
+                        if (mddev->pers->
+                            hot_add_disk(mddev, rdev) == 0) {
+                                if (sysfs_link_rdev(mddev, rdev))
+                                        /* failure here is OK */;
                                 spares++;
-                        if (rdev->raid_disk < 0
-                            && !test_bit(Faulty, &rdev->flags)) {
-                                rdev->recovery_offset = 0;
-                                if (mddev->pers->
-                                    hot_add_disk(mddev, rdev) == 0) {
-                                        if (sysfs_link_rdev(mddev, rdev))
-                                                /* failure here is OK */;
-                                        spares++;
-                                        md_new_event(mddev);
-                                        set_bit(MD_CHANGE_DEVS, &mddev->flags);
-                                }
+                                md_new_event(mddev);
+                                set_bit(MD_CHANGE_DEVS, &mddev->flags);
                         }
                 }
         }
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index c80f8c2471cc..b2c83859f75b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5376,8 +5376,9 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)
                 disk = rdev->saved_raid_disk;
         else
                 disk = first;
-        for ( ; disk <= last ; disk++)
-                if ((p=conf->disks + disk)->rdev == NULL) {
+        for ( ; disk <= last ; disk++) {
+                p = conf->disks + disk;
+                if (p->rdev == NULL) {
                         clear_bit(In_sync, &rdev->flags);
                         rdev->raid_disk = disk;
                         err = 0;
@@ -5386,6 +5387,17 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev)
                         rcu_assign_pointer(p->rdev, rdev);
                         break;
                 }
+                if (test_bit(WantReplacement, &p->rdev->flags) &&
+                    p->replacement == NULL) {
+                        clear_bit(In_sync, &rdev->flags);
+                        set_bit(Replacement, &rdev->flags);
+                        rdev->raid_disk = disk;
+                        err = 0;
+                        conf->fullsync = 1;
+                        rcu_assign_pointer(p->replacement, rdev);
+                        break;
+                }
+        }
         print_raid5_conf(conf);
         return err;
 }