Skip to content

Commit b5d2771

Browse files
XiaoNi87shligit
authored andcommitted
Raid5 should update rdev->sectors after reshape
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 <[email protected]> Acked-by: Guoqing Jiang <[email protected]> Cc: [email protected] Signed-off-by: Shaohua Li <[email protected]>
1 parent 4aaf769 commit b5d2771

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/md/raid5.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7951,12 +7951,10 @@ static void end_reshape(struct r5conf *conf)
79517951
{
79527952

79537953
if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) {
7954-
struct md_rdev *rdev;
79557954

79567955
spin_lock_irq(&conf->device_lock);
79577956
conf->previous_raid_disks = conf->raid_disks;
7958-
rdev_for_each(rdev, conf->mddev)
7959-
rdev->data_offset = rdev->new_data_offset;
7957+
md_finish_reshape(conf->mddev);
79607958
smp_wmb();
79617959
conf->reshape_progress = MaxSector;
79627960
conf->mddev->reshape_position = MaxSector;

0 commit comments

Comments
 (0)