diff options
| author | Shaohua Li <shli@fb.com> | 2016-08-30 19:29:33 +0200 |
|---|---|---|
| committer | Shaohua Li <shli@fb.com> | 2016-08-31 18:05:23 +0200 |
| commit | ad5b0f7685dbfc4730987cd16af3c5ebe8133f10 (patch) | |
| tree | 84a2c04da9521953b1883b04bc9b54a51d600a4c /drivers/md | |
| parent | raid5-cache: fix a deadlock in superblock write (diff) | |
| download | linux-ad5b0f7685dbfc4730987cd16af3c5ebe8133f10.tar.xz linux-ad5b0f7685dbfc4730987cd16af3c5ebe8133f10.zip | |
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: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index da583bb43c84..b95c54c0e596 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -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); |