diff options
author | NeilBrown <neilb@suse.de> | 2013-05-08 19:48:30 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2013-06-12 23:18:15 -0400 |
commit | 6b6204ee92adb53bfd6a77cb5679282ec3820c4b (patch) | |
tree | 750f1ac85412b93fae4cca92883fd6187380bc74 /drivers/md/md.c | |
parent | 32f9f570d04461a41bdcd5c1d93b41ebc5ce182a (diff) |
md: md_stop_writes() should always freeze recovery.
__md_stop_writes() will currently sometimes freeze recovery.
So any caller must be ready for that to happen, and indeed they are.
However if __md_stop_writes() doesn't freeze_recovery, then
a recovery could start before mddev_suspend() is called, which
could be awkward. This can particularly cause problems or dm-raid.
So change __md_stop_writes() to always freeze recovery. This is safe
and more predicatable.
Reported-by: Brassow Jonathan <jbrassow@redhat.com>
Tested-by: Brassow Jonathan <jbrassow@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4c74424c78b0..3e2acfa1696d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -5277,8 +5277,8 @@ static void md_clean(struct mddev *mddev) | |||
5277 | 5277 | ||
5278 | static void __md_stop_writes(struct mddev *mddev) | 5278 | static void __md_stop_writes(struct mddev *mddev) |
5279 | { | 5279 | { |
5280 | set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); | ||
5280 | if (mddev->sync_thread) { | 5281 | if (mddev->sync_thread) { |
5281 | set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); | ||
5282 | set_bit(MD_RECOVERY_INTR, &mddev->recovery); | 5282 | set_bit(MD_RECOVERY_INTR, &mddev->recovery); |
5283 | md_reap_sync_thread(mddev); | 5283 | md_reap_sync_thread(mddev); |
5284 | } | 5284 | } |