The following commit has been merged in the linux branch: commit e6ec4fe24572ee265723d895ec4159e5559c8266 Author: Jens Axboe jens.axboe@oracle.com Date: Tue Nov 3 20:21:35 2009 +0100

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

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 069a610..5802e32 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.