diff options
| author | NeilBrown <neilb@suse.de> | 2012-02-07 02:01:51 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-02-07 02:01:51 +0100 |
| commit | db91ff55bdf06736b849afc1b1fce5763bbb8d5d (patch) | |
| tree | ade2010773b721e3d699e75a9348f200e7ad31c4 /drivers/md/md.c | |
| parent | Prevent DM RAID from loading bitmap twice. (diff) | |
| download | linux-db91ff55bdf06736b849afc1b1fce5763bbb8d5d.tar.xz linux-db91ff55bdf06736b849afc1b1fce5763bbb8d5d.zip | |
md: two small fixes to handling interrupt resync.
1/ If a resync is aborted we should record how far we got
(recovery_cp) the last request that we know has completed
(->curr_resync_completed) rather than the last request that was
submitted (->curr_resync).
2/ When a resync aborts we still want to update the metadata with
any changes, so set MD_CHANGE_DEVS even if we 'skip'.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 33aa06f12b87..81d1c43dd97f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -7333,7 +7333,8 @@ void md_do_sync(struct mddev *mddev) printk(KERN_INFO "md: checkpointing %s of %s.\n", desc, mdname(mddev)); - mddev->recovery_cp = mddev->curr_resync; + mddev->recovery_cp = + mddev->curr_resync_completed; } } else mddev->recovery_cp = MaxSector; @@ -7351,9 +7352,9 @@ void md_do_sync(struct mddev *mddev) rcu_read_unlock(); } } + skip: 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)) |