From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 3 Nov 2009 20:25:45 +0000 (+0100)
Subject: cfq-iosched: fix merge error
X-Git-Tag: v2.6.33-rc1~379^2~74
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=125c4f221a5352ae08aef2898055b879ad963f01;ds=sidebyside

cfq-iosched: fix merge error

We ended up with testing the same condition twice, pretty
pointless. Remove that first if.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 13b612f..b700f41 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2433,7 +2433,6 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
 	 * if this request is as-good as one we would expect from the
 	 * current cfqq, let it preempt
 	 */
-	if (cfq_rq_close(cfqd, cfqq, rq))
 	if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) ||
 	    cfqd->busy_queues == 1)) {
 		/*