evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

md/raid10: resize bitmap when required during reshape.

Browse source 
If a reshape changes the size of the array, then we can now
update the bitmap to suit - so do so.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2012-05-22 13:55:28 +10:00
parent a4a6125a07
commit bb63a7019d
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/md/raid10.c
View file

@ -3786,8 +3786,6 @@ static int raid10_check_reshape(struct mddev *mddev)
/* not factor of array size */ /* not factor of array size */
return -EINVAL; return -EINVAL;
if (mddev->bitmap)
return -EBUSY;
if (!enough(conf, -1)) if (!enough(conf, -1))
return -EINVAL; return -EINVAL;
@ -3882,6 +3880,7 @@ static int raid10_start_reshape(struct mddev *mddev)
struct r10conf *conf = mddev->private; struct r10conf *conf = mddev->private;
struct md_rdev *rdev; struct md_rdev *rdev;
int spares = 0; int spares = 0;
int ret;
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
return -EBUSY; return -EBUSY;
@ -3943,6 +3942,14 @@ static int raid10_start_reshape(struct mddev *mddev)
conf->reshape_progress = 0; conf->reshape_progress = 0;
spin_unlock_irq(&conf->device_lock); spin_unlock_irq(&conf->device_lock);
if (mddev->delta_disks && mddev->bitmap) {
ret = bitmap_resize(mddev->bitmap,
raid10_size(mddev, 0,
conf->geo.raid_disks),
0, 0);
if (ret)
goto abort;
}
if (mddev->delta_disks > 0) { if (mddev->delta_disks > 0) {
rdev_for_each(rdev, mddev) rdev_for_each(rdev, mddev)
if (rdev->raid_disk < 0 && if (rdev->raid_disk < 0 &&
@ -3982,22 +3989,26 @@ static int raid10_start_reshape(struct mddev *mddev)
mddev->sync_thread = md_register_thread(md_do_sync, mddev, mddev->sync_thread = md_register_thread(md_do_sync, mddev,
"reshape"); "reshape");
if (!mddev->sync_thread) { if (!mddev->sync_thread) {
mddev->recovery = 0; ret = -EAGAIN;
spin_lock_irq(&conf->device_lock); goto abort;
conf->geo = conf->prev;
mddev->raid_disks = conf->geo.raid_disks;
rdev_for_each(rdev, mddev)
rdev->new_data_offset = rdev->data_offset;
smp_wmb();
conf->reshape_progress = MaxSector;
mddev->reshape_position = MaxSector;
spin_unlock_irq(&conf->device_lock);
return -EAGAIN;
} }
conf->reshape_checkpoint = jiffies; conf->reshape_checkpoint = jiffies;
md_wakeup_thread(mddev->sync_thread); md_wakeup_thread(mddev->sync_thread);
md_new_event(mddev); md_new_event(mddev);
return 0; return 0;
abort:
mddev->recovery = 0;
spin_lock_irq(&conf->device_lock);
conf->geo = conf->prev;
mddev->raid_disks = conf->geo.raid_disks;
rdev_for_each(rdev, mddev)
rdev->new_data_offset = rdev->data_offset;
smp_wmb();
conf->reshape_progress = MaxSector;
mddev->reshape_position = MaxSector;
spin_unlock_irq(&conf->device_lock);
return ret;
} }
/* Calculate the last device-address that could contain /* Calculate the last device-address that could contain