cfq-iosched: fix merge error
Jens Axboe [Tue, 3 Nov 2009 20:25:45 +0000 (21:25 +0100)]
We ended up with testing the same condition twice, pretty
pointless. Remove that first if.

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

block/cfq-iosched.c

index 13b612f..b700f41 100644 (file)
@@ -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)) {
                /*