cfq-iosched: use assigned slice sync value, not default

We should use the sysfs modified slice sync value, in case it differs
from the default.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 3010e2ec20c2d1181e1707a0d0443f897e3c4aec..ebab60c6be9d73cbe7140f3020cd0aef79cc4b3e 100644 (file)
--- 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;
        }