Commit ca1e98e0 authored Oct 18, 2018 by Guoqing Jiang Committed by Shaohua Li Oct 18, 2018

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>

parent aefb2e5f

drivers/md/md.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -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",

Admin message