diff options
author | Shaohua Li <shli@fb.com> | 2018-10-14 17:05:07 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-13 11:17:05 -0800 |
commit | 627ab1faa16bab6183f94fbfc300d61590603b05 (patch) | |
tree | 128166b008557ef7047333964428f14beebbcd36 /drivers/md/md.c | |
parent | f3bc71fa0e6a9f4c3293f73f1cdd4d8ebf0f013e (diff) |
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>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index efb012b927c9..a7a0e3acdb2f 100644 --- 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) |