diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 18:06:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 18:06:47 +0200 |
| commit | eff0d13f3823f35d70228cd151d2a2c89288ff32 (patch) | |
| tree | 55bff4dbcc43c4b0f38509ac4de585c0c457980c /drivers/md/raid1.c | |
| parent | Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... (diff) | |
| download | linux-eff0d13f3823f35d70228cd151d2a2c89288ff32.tar.xz linux-eff0d13f3823f35d70228cd151d2a2c89288ff32.zip | |
Merge branch 'for-3.6/drivers' of git://git.kernel.dk/linux-block
Pull block driver changes from Jens Axboe:
- Making the plugging support for drivers a bit more sane from Neil.
This supersedes the plugging change from Shaohua as well.
- The usual round of drbd updates.
- Using a tail add instead of a head add in the request completion for
ndb, making us find the most completed request more quickly.
- A few floppy changes, getting rid of a duplicated flag and also
running the floppy init async (since it takes forever in boot terms)
from Andi.
* 'for-3.6/drivers' of git://git.kernel.dk/linux-block:
floppy: remove duplicated flag FD_RAW_NEED_DISK
blk: pass from_schedule to non-request unplug functions.
block: stack unplug
blk: centralize non-request unplug handling.
md: remove plug_cnt feature of plugging.
block/nbd: micro-optimization in nbd request completion
drbd: announce FLUSH/FUA capability to upper layers
drbd: fix max_bio_size to be unsigned
drbd: flush drbd work queue before invalidate/invalidate remote
drbd: fix potential access after free
drbd: call local-io-error handler early
drbd: do not reset rs_pending_cnt too early
drbd: reset congestion information before reporting it in /proc/drbd
drbd: report congestion if we are waiting for some userland callback
drbd: differentiate between normal and forced detach
drbd: cleanup, remove two unused global flags
floppy: Run floppy initialization asynchronous
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 197f62681db5..9f7f8bee8442 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2247,8 +2247,7 @@ static void raid1d(struct mddev *mddev) blk_start_plug(&plug); for (;;) { - if (atomic_read(&mddev->plug_cnt) == 0) - flush_pending_writes(conf); + flush_pending_writes(conf); spin_lock_irqsave(&conf->device_lock, flags); if (list_empty(head)) { |