diff options
| author | Divyesh Shah <dpshah@google.com> | 2010-04-14 11:22:38 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-14 11:22:38 +0200 |
| commit | 28baf44299e0480d66ebb3093de5d51deff04e9f (patch) | |
| tree | 2cac2546027638c269441f4035a67abd3d267ca4 /block/cfq-iosched.c | |
| parent | Merge branch 'master' into for-2.6.35 (diff) | |
| download | linux-28baf44299e0480d66ebb3093de5d51deff04e9f.tar.xz linux-28baf44299e0480d66ebb3093de5d51deff04e9f.zip | |
blkio: Fix compile errors
Fixes compile errors in blk-cgroup code for empty_time stat and a merge fix in
CFQ. The first error was when CONFIG_DEBUG_CFQ_IOSCHED is not set.
Signed-off-by: Divyesh Shah <dpshah@google.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 9e0df2bdcf21..01771098355d 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2231,7 +2231,7 @@ static int cfq_forced_dispatch(struct cfq_data *cfqd) int dispatched = 0; /* Expire the timeslice of the current active queue first */ - cfq_slice_expired(cfqd, 0); + cfq_slice_expired(cfqd, 0, true); while ((cfqq = cfq_get_next_queue_forced(cfqd)) != NULL) { __cfq_set_active_queue(cfqd, cfqq); dispatched += __cfq_forced_dispatch_cfqq(cfqq); |