Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad5b0f76 authored by Shaohua Li's avatar Shaohua Li
Browse files

raid5: guarantee enough stripes to avoid reshape hang 



If there aren't enough stripes, reshape will hang. We have a check for
this in new reshape, but miss it for reshape resume, hence we could see
hang in reshape resume. This patch forces enough stripes existed if
reshape resumes.

Reviewed-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 8e018c21

drivers/md/raid5.c

+10 −0
Original line number Diff line number Diff line
@@ -6639,6 +6639,16 @@ static struct r5conf *setup_conf(struct mddev *mddev) 
	}



	conf->min_nr_stripes = NR_STRIPES;

	if (mddev->reshape_position != MaxSector) {

		int stripes = max_t(int,

			((mddev->chunk_sectors << 9) / STRIPE_SIZE) * 4,

			((mddev->new_chunk_sectors << 9) / STRIPE_SIZE) * 4);

		conf->min_nr_stripes = max(NR_STRIPES, stripes);

		if (conf->min_nr_stripes != NR_STRIPES)

			printk(KERN_INFO

				"md/raid:%s: force stripe size %d for reshape\n",

				mdname(mddev), conf->min_nr_stripes);

	}

	memory = conf->min_nr_stripes * (sizeof(struct stripe_head) +

		 max_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024;

	atomic_set(&conf->empty_inactive_list_nr, NR_STRIPE_HASH_LOCKS);