summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2009-12-14 12:49:48 +1100
committerNeilBrown <neilb@suse.de>2009-12-14 12:49:48 +1100
commitc07b70ad32ed0a5ec9735cafb1aa10b3a2298b7d (patch)
tree451d88cd7e44ee8217a294335a04594bd573b828 /drivers/md
parent7820f9e1dddcfebae2698fb2a245d04ce3aa6e74 (diff)
downloadkernel-common-c07b70ad32ed0a5ec9735cafb1aa10b3a2298b7d.tar.gz
kernel-common-c07b70ad32ed0a5ec9735cafb1aa10b3a2298b7d.tar.bz2
kernel-common-c07b70ad32ed0a5ec9735cafb1aa10b3a2298b7d.zip
md: adjust resync_min usefully when resync aborts.
When a 'check' or 'repair' finished we should clear resync_min so that a future check/repair will cover the whole array (by default). However if it is interrupted, we should update resync_min to where we got up to, so that when the check/repair continues it just does the remainder of the array. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/md.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1be7a16a7a53..a08aa582925b 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6524,11 +6524,15 @@ void md_do_sync(mddev_t *mddev)
set_bit(MD_CHANGE_DEVS, &mddev->flags);
skip:
+ if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery)) {
+ /* We completed so min/max setting can be forgotten if used. */
+ if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
+ mddev->resync_min = 0;
+ mddev->resync_max = MaxSector;
+ } else if (test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery))
+ mddev->resync_min = mddev->curr_resync_completed;
mddev->curr_resync = 0;
mddev->curr_resync_completed = 0;
- if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery))
- /* We completed so max setting can be forgotten. */
- mddev->resync_max = MaxSector;
sysfs_notify(&mddev->kobj, NULL, "sync_completed");
wake_up(&resync_wait);
set_bit(MD_RECOVERY_DONE, &mddev->recovery);