diff options
| author | Guoqing Jiang <gqjiang@suse.com> | 2018-10-18 16:37:45 +0800 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2018-10-18 09:39:10 -0700 |
| commit | ca1e98e04a8d6cefbe8ad138df806434de6de7f3 (patch) | |
| tree | a08f7a5f0256f406b6bbfc218ee4daa0b9a6dd58 /drivers/md | |
| parent | aefb2e5fc2be590e6bef8985f3d175c3d38b0b77 (diff) | |
| download | linux-stable-ca1e98e04a8d6cefbe8ad138df806434de6de7f3.tar.gz linux-stable-ca1e98e04a8d6cefbe8ad138df806434de6de7f3.tar.bz2 linux-stable-ca1e98e04a8d6cefbe8ad138df806434de6de7f3.zip | |
md-cluster/raid10: don't call remove_and_add_spares during reshaping stage
remove_and_add_spares is not needed if reshape is
happening in another node, because raid10_add_disk
called inside raid10_start_reshape would handle the
role changes of disk. Plus, remove_and_add_spares
can't deal with the role change due to reshape.
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index e28f5db0a882..fa2bbdec9955 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9218,8 +9218,12 @@ static void check_sb_changes(struct mddev *mddev, struct md_rdev *rdev) } if (role != rdev2->raid_disk) { - /* got activated */ - if (rdev2->raid_disk == -1 && role != 0xffff) { + /* + * got activated except reshape is happening. + */ + if (rdev2->raid_disk == -1 && role != 0xffff && + !(le32_to_cpu(sb->feature_map) & + MD_FEATURE_RESHAPE_ACTIVE)) { rdev2->saved_raid_disk = role; ret = remove_and_add_spares(mddev, rdev2); pr_info("Activated spare: %s\n", |