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.h | |
| parent | aeeae86859f4319de0a4946b44771d9926eeed54 (diff) | |
| parent | ffcd7dca3ab78f9f425971756e5e90024157f6be (diff) | |
| download | kernel_samsung_smdk4412-6a5d263866d699ebf6843105497afc86ee53de5b.zip kernel_samsung_smdk4412-6a5d263866d699ebf6843105497afc86ee53de5b.tar.gz kernel_samsung_smdk4412-6a5d263866d699ebf6843105497afc86ee53de5b.tar.bz2 | |
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.h')
| -rw-r--r-- | block/blk.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/block/blk.h b/block/blk.h index 3ee9435..24fcaee 100644 --- a/block/blk.h +++ b/block/blk.h @@ -70,6 +70,10 @@ void blk_queue_congestion_threshold(struct request_queue *q); int blk_dev_init(void); +void elv_quisce_start(struct request_queue *q); +void elv_quisce_end(struct request_queue *q); + + /* * Return the threshold (number of used requests) at which the queue is * considered to be congested. It include a little hysteresis to keep the @@ -108,12 +112,14 @@ static inline int blk_cpu_to_group(int cpu) #endif } -static inline int blk_do_io_stat(struct request_queue *q) +static inline int blk_do_io_stat(struct request *rq) { - if (q) - return blk_queue_io_stat(q); + struct gendisk *disk = rq->rq_disk; - return 0; + if (!disk || !disk->queue) + return 0; + + return blk_queue_io_stat(disk->queue) && (rq->cmd_flags & REQ_ELVPRIV); } #endif |