diff options
-rw-r--r-- | block/cfq-iosched.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ebab60c6be9d..9c4b679908f4 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1345,16 +1345,9 @@ static int cfq_dispatch_requests(struct request_queue *q, int force) | |||
1345 | unsigned long last_sync = jiffies - cfqd->last_end_sync_rq; | 1345 | unsigned long last_sync = jiffies - cfqd->last_end_sync_rq; |
1346 | unsigned int depth; | 1346 | unsigned int depth; |
1347 | 1347 | ||
1348 | /* | ||
1349 | * must wait a bit longer | ||
1350 | */ | ||
1351 | if (last_sync < cfqd->cfq_slice[1]) { | ||
1352 | cfq_schedule_dispatch(cfqd, | ||
1353 | cfqd->cfq_slice[1] - last_sync); | ||
1354 | return 0; | ||
1355 | } | ||
1356 | |||
1357 | depth = last_sync / cfqd->cfq_slice[1]; | 1348 | depth = last_sync / cfqd->cfq_slice[1]; |
1349 | if (!depth && !cfqq->dispatched) | ||
1350 | depth = 1; | ||
1358 | if (depth < max_dispatch) | 1351 | if (depth < max_dispatch) |
1359 | max_dispatch = depth; | 1352 | max_dispatch = depth; |
1360 | } | 1353 | } |