diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-25 10:59:56 +0100 |
| commit | 669d6ece85f7750c01803662c8d8d3db8f726361 (patch) | |
| tree | 7f51fdc0274ff3c2da0ffb309d77f6158ff0dc0a /block | |
| parent | 5f0028625b529f647e747d043ebde087be60e5b7 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
| download | lwn-669d6ece85f7750c01803662c8d8d3db8f726361.tar.gz lwn-669d6ece85f7750c01803662c8d8d3db8f726361.zip | |
Merge branch 'linus' into rt/head
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 800d396f8924..94cf03ecac42 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1147,7 +1147,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) */ static inline bool queue_should_plug(struct request_queue *q) { - return !(blk_queue_nonrot(q) && blk_queue_queuing(q)); + return !(blk_queue_nonrot(q) && blk_queue_tagged(q)); } static int __make_request(struct request_queue *q, struct bio *bio) @@ -1859,15 +1859,8 @@ void blk_dequeue_request(struct request *rq) * and to it is freed is accounted as io that is in progress at * the driver side. */ - if (blk_account_rq(rq)) { + if (blk_account_rq(rq)) q->in_flight[rq_is_sync(rq)]++; - /* - * Mark this device as supporting hardware queuing, if - * we have more IOs in flight than 4. - */ - if (!blk_queue_queuing(q) && queue_in_flight(q) > 4) - set_bit(QUEUE_FLAG_CQ, &q->queue_flags); - } } /** |