diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:57:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:57:02 -0800 |
| commit | 6bee58259fce0baad7b02c7a48146d50fa7f6c3c (patch) | |
| tree | 16373d37cf5143993a930350338e830e681359a6 | |
| parent | d178f27fc5150d680d9df865ea9dfe3269cf00a6 (diff) | |
| parent | 8dee7211467a56b7eb4e4359efb0aa4a72e1b6f3 (diff) | |
| download | linux-3.10-6bee58259fce0baad7b02c7a48146d50fa7f6c3c.tar.gz linux-3.10-6bee58259fce0baad7b02c7a48146d50fa7f6c3c.tar.bz2 linux-3.10-6bee58259fce0baad7b02c7a48146d50fa7f6c3c.zip | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid5: make sure curr_sync_completes is uptodate when reshape starts
md: don't clear endpoint for resync when resync is interrupted.
| -rw-r--r-- | drivers/md/md.c | 5 | ||||
| -rw-r--r-- | drivers/md/raid5.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 10eb1fce975..e64c971038d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -6504,8 +6504,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); diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 81abefc172d..dcce204b6c7 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4049,6 +4049,8 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped sector_nr = conf->reshape_progress; sector_div(sector_nr, new_data_disks); if (sector_nr) { + mddev->curr_resync_completed = sector_nr; + sysfs_notify(&mddev->kobj, NULL, "sync_completed"); *skipped = 1; return sector_nr; } |