diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 10:13:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 10:13:29 -0700 |
| commit | 82ea4be61f45d1a7ba1f5151d90124d1ece0c07a (patch) | |
| tree | 2d2e89a3074d8385478ca5c4b5918f3552d3c25e /drivers/md/md.c | |
| parent | turbostat: Increase output buffer size to accommodate C8-C10 (diff) | |
| parent | md/raid1,5,10: Disable WRITE SAME until a recovery strategy is in place (diff) | |
| download | linux-dev-82ea4be61f45d1a7ba1f5151d90124d1ece0c07a.tar.xz linux-dev-82ea4be61f45d1a7ba1f5151d90124d1ece0c07a.zip | |
Merge tag 'md-3.10-fixes' of git://neil.brown.name/md
Pull md bugfixes from Neil Brown:
"A few bugfixes for md
Some tagged for -stable"
* tag 'md-3.10-fixes' of git://neil.brown.name/md:
md/raid1,5,10: Disable WRITE SAME until a recovery strategy is in place
md/raid1,raid10: use freeze_array in place of raise_barrier in various places.
md/raid1: consider WRITE as successful only if at least one non-Faulty and non-rebuilding drive completed it.
md: md_stop_writes() should always freeze recovery.
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 681d1099a2d5..9b82377a833b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5268,8 +5268,8 @@ static void md_clean(struct mddev *mddev) static void __md_stop_writes(struct mddev *mddev) { + set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); if (mddev->sync_thread) { - set_bit(MD_RECOVERY_FROZEN, &mddev->recovery); set_bit(MD_RECOVERY_INTR, &mddev->recovery); md_reap_sync_thread(mddev); } |