diff options
| author | Gui Jianfeng <guijianfeng@cn.fujitsu.com> | 2010-12-17 08:57:14 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-12-17 08:57:14 +0100 |
| commit | 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00 (patch) | |
| tree | e080ada1f8cc00fef4600976f8cf489cc94d1c03 /block/cfq-iosched.c | |
| parent | fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors (diff) | |
| download | linux-7278c9c19bd85cf33213a2e0b538a18d3ac8ad00.tar.xz linux-7278c9c19bd85cf33213a2e0b538a18d3ac8ad00.zip | |
cfq-iosched: don't check cfqg in choose_service_tree()
When cfq_choose_cfqg() is called in select_queue(), there must be at least one
backlogged CFQ queue waiting for dispatching, hence there must be at least one
backlogged CFQ group on service tree. So we never call choose_service_tree()
with cfqg == NULL.
Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 9b186fd6bf47..c19d015ac5a5 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2103,12 +2103,6 @@ static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg) unsigned group_slice; enum wl_prio_t original_prio = cfqd->serving_prio; - if (!cfqg) { - cfqd->serving_prio = IDLE_WORKLOAD; - cfqd->workload_expires = jiffies + 1; - return; - } - /* Choose next priority. RT > BE > IDLE */ if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg)) cfqd->serving_prio = RT_WORKLOAD; |