aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-11-03 21:25:45 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-03 21:25:45 +0100
commit125c4f221a5352ae08aef2898055b879ad963f01 (patch)
tree3114b880f0da09535d164923698a7e8d0b700e54 /block
parent2058297d2d045cb57138c33b87cfabcc80e65186 (diff)
downloadlinux-stericsson-125c4f221a5352ae08aef2898055b879ad963f01.tar.gz
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>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 13b612f9f27a..b700f41cafb3 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)) {
/*