diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2012-01-19 09:20:09 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-01-19 09:20:09 +0100 |
| commit | df0793abb929e66606fa25f3875ff1b89de5ad32 (patch) | |
| tree | fa53e6e4e7f4a6773f45173132bbfd77908f7c17 | |
| parent | 90a4c0f51e8e44111a926be6f4c87af3938a79c3 (diff) | |
| download | linux-df0793abb929e66606fa25f3875ff1b89de5ad32.tar.gz linux-df0793abb929e66606fa25f3875ff1b89de5ad32.tar.bz2 linux-df0793abb929e66606fa25f3875ff1b89de5ad32.zip | |
block,cfq: change code order
cfq_slice_expired will change saved_workload_slice. It should be called
first so saved_workload_slice is correctly set to 0 after workload type
is changed.
This fixes the code order changed by 54b466e44b1c7.
Tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/cfq-iosched.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ee55019066a1..da21c24dbed3 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3117,17 +3117,18 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq, */ static void cfq_preempt_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq) { + enum wl_type_t old_type = cfqq_type(cfqd->active_queue); + cfq_log_cfqq(cfqd, cfqq, "preempt"); + cfq_slice_expired(cfqd, 1); /* * workload type is changed, don't save slice, otherwise preempt * doesn't happen */ - if (cfqq_type(cfqd->active_queue) != cfqq_type(cfqq)) + if (old_type != cfqq_type(cfqq)) cfqq->cfqg->saved_workload_slice = 0; - cfq_slice_expired(cfqd, 1); - /* * Put the new queue at the front of the of the current list, * so we know that it will be selected next. |