MD: fix invalid stored role for a disk - try2

commit 9e753ba9b9b405e3902d9f08aec5f2ea58a0c317 upstream.

Commit d595567dc4f0 (MD: fix invalid stored role for a disk) broke linear
hotadd. Let's only fix the role for disks in raid1/10.
Based on Guoqing's original patch.

Reported-by: kernel test robot <rong.a.chen@intel.com>
Cc: Gioh Kim <gi-oh.kim@profitbricks.com>
Cc: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index efb012b927c94836349d6a600b94c1daed28ed10..a7a0e3acdb2f0ebc3b0dc37079108816836d4d9b 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1665,10 +1665,6 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
                        } else
                                set_bit(In_sync, &rdev->flags);
                        rdev->raid_disk = role;
-                       if (role >= mddev->raid_disks) {
-                               rdev->saved_raid_disk = -1;
-                               rdev->raid_disk = -1;
-                       }
                        break;
                }
                if (sb->devflags & WriteMostly1)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 998102697619b896a64dc647aefb44655f5462aa..53048bf0b2b81477995befd5be197a5e05a65488 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1589,6 +1589,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
         */
        if (rdev->saved_raid_disk >= 0 &&
            rdev->saved_raid_disk >= first &&
+           rdev->saved_raid_disk < conf->raid_disks &&
            conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
                first = last = rdev->saved_raid_disk;
 

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index b3046063402c6bc462532883fd6016a4bd656a4b..b62e6ab66b316572a7e2b817f8fb0fca2a6ed9ba 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1734,6 +1734,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
                first = last = rdev->raid_disk;
 
        if (rdev->saved_raid_disk >= first &&
+           rdev->saved_raid_disk < conf->geo.raid_disks &&
            conf->mirrors[rdev->saved_raid_disk].rdev == NULL)
                mirror = rdev->saved_raid_disk;
        else