]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
md: adjust resync_min usefully when resync aborts.
authorNeilBrown <neilb@suse.de>
Mon, 14 Dec 2009 01:49:48 +0000 (12:49 +1100)
committerNeilBrown <neilb@suse.de>
Mon, 14 Dec 2009 01:49:48 +0000 (12:49 +1100)
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>
drivers/md/md.c

index 1be7a16a7a53898196b4b9f03894e755e73d1894..a08aa582925b96edd1411937722327180d671319 100644 (file)
@@ -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);