Merge commit 'v2.6.32-rc7'

[mv-sheeva.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index e9cad8889cf9b1e6a0f907997acf898cacbe45e4..1d529551e94491731b4b03b5ff17eb7be1352afb 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6500,8 +6500,9 @@ void md_do_sync(mddev_t *mddev)
  skip:
        mddev->curr_resync = 0;
        mddev->curr_resync_completed = 0;
-       mddev->resync_min = 0;
-       mddev->resync_max = MaxSector;
+       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);