diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 12:57:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 12:57:02 -0500 |
commit | 6bee58259fce0baad7b02c7a48146d50fa7f6c3c (patch) | |
tree | 16373d37cf5143993a930350338e830e681359a6 /drivers/md/raid5.c | |
parent | d178f27fc5150d680d9df865ea9dfe3269cf00a6 (diff) | |
parent | 8dee7211467a56b7eb4e4359efb0aa4a72e1b6f3 (diff) |
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.
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 81abefc172d9..dcce204b6c73 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 | |||
4049 | sector_nr = conf->reshape_progress; | 4049 | sector_nr = conf->reshape_progress; |
4050 | sector_div(sector_nr, new_data_disks); | 4050 | sector_div(sector_nr, new_data_disks); |
4051 | if (sector_nr) { | 4051 | if (sector_nr) { |
4052 | mddev->curr_resync_completed = sector_nr; | ||
4053 | sysfs_notify(&mddev->kobj, NULL, "sync_completed"); | ||
4052 | *skipped = 1; | 4054 | *skipped = 1; |
4053 | return sector_nr; | 4055 | return sector_nr; |
4054 | } | 4056 | } |