From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 3 Nov 2009 19:21:35 +0000 (+0100)
Subject: cfq-iosched: fix bad return value cfq_should_preempt()
X-Git-Tag: v2.6.32-rc7~80^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6ec4fe24572ee265723d895ec4159e5559c8266;p=~emulex%2Finfiniband.git

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 069a61017c0..5802e322b7a 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.