summaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 3010e2ec20c..ebab60c6be9 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1348,12 +1348,13 @@ static int cfq_dispatch_requests(struct request_queue *q, int force)
/*
* must wait a bit longer
*/
- if (last_sync < cfq_slice_sync) {
- cfq_schedule_dispatch(cfqd, cfq_slice_sync - last_sync);
+ if (last_sync < cfqd->cfq_slice[1]) {
+ cfq_schedule_dispatch(cfqd,
+ cfqd->cfq_slice[1] - last_sync);
return 0;
}
- depth = last_sync / cfq_slice_sync;
+ depth = last_sync / cfqd->cfq_slice[1];
if (depth < max_dispatch)
max_dispatch = depth;
}