|
@@ -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;
|