diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:06:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:06:41 -0700 |
| commit | 6a5d263866d699ebf6843105497afc86ee53de5b (patch) | |
| tree | 439195e272631908cdc2e3e44abaf7e1c3447157 /block/blk-sysfs.c | |
| parent | aeeae86859f4319de0a4946b44771d9926eeed54 (diff) | |
| parent | ffcd7dca3ab78f9f425971756e5e90024157f6be (diff) | |
| download | op-kernel-dev-6a5d263866d699ebf6843105497afc86ee53de5b.zip op-kernel-dev-6a5d263866d699ebf6843105497afc86ee53de5b.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
loop: mutex already unlocked in loop_clr_fd()
cfq-iosched: don't let idling interfere with plugging
block: remove unused REQ_UNPLUG
cfq-iosched: kill two unused cfqq flags
cfq-iosched: change dispatch logic to deal with single requests at the time
mflash: initial support
cciss: change to discover first memory BAR
cciss: kernel scan thread for MSA2012
cciss: fix residual count for block pc requests
block: fix inconsistency in I/O stat accounting code
block: elevator quiescing helpers
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 3ff9bba..73f36be 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -209,10 +209,14 @@ static ssize_t queue_iostats_store(struct request_queue *q, const char *page, ssize_t ret = queue_var_store(&stats, page, count); spin_lock_irq(q->queue_lock); + elv_quisce_start(q); + if (stats) queue_flag_set(QUEUE_FLAG_IO_STAT, q); else queue_flag_clear(QUEUE_FLAG_IO_STAT, q); + + elv_quisce_end(q); spin_unlock_irq(q->queue_lock); return ret; |
