Commit 125c4f22 authored by Jens Axboe's avatar Jens Axboe

cfq-iosched: fix merge error

We ended up with testing the same condition twice, pretty
pointless. Remove that first if.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 2058297d
......@@ -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)) {
/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment