diff options
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 1 |
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, | |||
| 2433 | * if this request is as-good as one we would expect from the | 2433 | * if this request is as-good as one we would expect from the |
| 2434 | * current cfqq, let it preempt | 2434 | * current cfqq, let it preempt |
| 2435 | */ | 2435 | */ |
| 2436 | if (cfq_rq_close(cfqd, cfqq, rq)) | ||
| 2437 | if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) || | 2436 | if (cfq_rq_close(cfqd, cfqq, rq) && (!cfq_cfqq_coop(new_cfqq) || |
| 2438 | cfqd->busy_queues == 1)) { | 2437 | cfqd->busy_queues == 1)) { |
| 2439 | /* | 2438 | /* |