diff options
| author | Xiao Ni <xni@redhat.com> | 2017-07-05 17:34:04 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-27 15:03:26 -0700 |
| commit | b7befd40b0eb5d592af35509bbf66caf569d7ad0 (patch) | |
| tree | c087776b7f9ee328f071d8d83edbe018103f88f3 /drivers/md | |
| parent | 94e0ff076aacf541ef392a2b0aa493ed71f48614 (diff) | |
| download | linux-stable-b7befd40b0eb5d592af35509bbf66caf569d7ad0.tar.gz linux-stable-b7befd40b0eb5d592af35509bbf66caf569d7ad0.tar.bz2 linux-stable-b7befd40b0eb5d592af35509bbf66caf569d7ad0.zip | |
Raid5 should update rdev->sectors after reshape
commit b5d27718f38843a74552e9a93d32e2391fd3999f upstream.
The raid5 md device is created by the disks which we don't use the total size. For example,
the size of the device is 5G and it just uses 3G of the devices to create one raid5 device.
Then change the chunksize and wait reshape to finish. After reshape finishing stop the raid
and assemble it again. It fails.
mdadm -CR /dev/md0 -l5 -n3 /dev/loop[0-2] --size=3G --chunk=32 --assume-clean
mdadm /dev/md0 --grow --chunk=64
wait reshape to finish
mdadm -S /dev/md0
mdadm -As
The error messages:
[197519.814302] md: loop1 does not have a valid v1.2 superblock, not importing!
[197519.821686] md: md_import_device returned -22
After reshape the data offset is changed. It selects backwards direction in this condition.
In function super_1_load it compares the available space of the underlying device with
sb->data_size. The new data offset gets bigger after reshape. So super_1_load returns -EINVAL.
rdev->sectors is updated in md_finish_reshape. Then sb->data_size is set in super_1_sync based
on rdev->sectors. So add md_finish_reshape in end_reshape.
Signed-off-by: Xiao Ni <xni@redhat.com>
Acked-by: 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')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index a7170a31837e..604c5dc95ffc 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6722,12 +6722,10 @@ static void end_reshape(struct r5conf *conf) { if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) { - struct md_rdev *rdev; spin_lock_irq(&conf->device_lock); conf->previous_raid_disks = conf->raid_disks; - rdev_for_each(rdev, conf->mddev) - rdev->data_offset = rdev->new_data_offset; + md_finish_reshape(conf->mddev); smp_wmb(); conf->reshape_progress = MaxSector; spin_unlock_irq(&conf->device_lock); |