diff options
| author | NeilBrown <neilb@suse.de> | 2012-05-21 09:28:33 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-05-21 09:28:33 +1000 |
| commit | c804cdecea418c067ee7359d62139b2b3c8cec39 (patch) | |
| tree | 8542c9757416deee1637528b6616cbcc92cf8cdc /drivers/md | |
| parent | 1fdd6fc92f330b81604c9a4f892f713775a9751a (diff) | |
| download | linux-3.10-c804cdecea418c067ee7359d62139b2b3c8cec39.tar.gz linux-3.10-c804cdecea418c067ee7359d62139b2b3c8cec39.tar.bz2 linux-3.10-c804cdecea418c067ee7359d62139b2b3c8cec39.zip | |
md: use resync_max_sectors for reshape as well as resync.
Some resync type operations need to act on the address space of the
device, others on the address space of the array.
This only affects RAID10, so it sets resync_max_sectors to the array
size (it defaults to the device size), and that is currently used for
resync only. However reshape of a RAID10 must be done against the
array size, not device size, so change code to use resync_max_sectors
for both the resync and the reshape cases.
This does not affect RAID5 or RAID1, just RAID10.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/md.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index c6b8d9fd0b0..8fe1abf1b89 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -4425,7 +4425,8 @@ sync_completed_show(struct mddev *mddev, char *page) if (!test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) return sprintf(page, "none\n"); - if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) + if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || + test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) max_sectors = mddev->resync_max_sectors; else max_sectors = mddev->dev_sectors; @@ -6803,7 +6804,8 @@ static void status_resync(struct seq_file *seq, struct mddev * mddev) resync = mddev->curr_resync - atomic_read(&mddev->recovery_active); - if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) + if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) || + test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) max_sectors = mddev->resync_max_sectors; else max_sectors = mddev->dev_sectors; @@ -7366,7 +7368,7 @@ void md_do_sync(struct mddev *mddev) j = mddev->recovery_cp; } else if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) - max_sectors = mddev->dev_sectors; + max_sectors = mddev->resync_max_sectors; else { /* recovery follows the physical size of devices */ max_sectors = mddev->dev_sectors; |