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 <[email protected]>
maraz · Nov 3, 2009 · 125c4f2 · 125c4f2
1 parent 2058297
commit 125c4f2
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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)) {
 		/*