summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-11-03 20:21:35 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-03 20:21:35 +0100
commite6ec4fe24572ee265723d895ec4159e5559c8266 (patch)
treecf61a73b2e50d695579cffe4226d41da5c889f8f /block
parentbacking-dev: bdi sb prune should be in the unregister path, not destroy (diff)
downloadlinux-e6ec4fe24572ee265723d895ec4159e5559c8266.tar.xz
linux-e6ec4fe24572ee265723d895ec4159e5559c8266.zip
cfq-iosched: fix bad return value cfq_should_preempt()
Commit a6151c3a5c8e1ff5a28450bc8d6a99a2a0add0a7 inadvertently reversed a preempt condition check, potentially causing a performance regression. Make the meta check correct again. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 069a61017c02..5802e322b7ad 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2051,7 +2051,7 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
* it's a metadata request and the current queue is doing regular IO.
*/
if (rq_is_meta(rq) && !cfqq->meta_pending)
- return false;
+ return true;
/*
* Allow an RT request to pre-empt an ongoing non-RT cfqq timeslice.