Commit 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00
Committed by
Jens Axboe
1 parent
a8adbe378b
Exists in
master
and in
4 other branches
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>
Showing 1 changed file with 0 additions and 6 deletions Side-by-side Diff
block/cfq-iosched.c
... | ... | @@ -2103,12 +2103,6 @@ |
2103 | 2103 | unsigned group_slice; |
2104 | 2104 | enum wl_prio_t original_prio = cfqd->serving_prio; |
2105 | 2105 | |
2106 | - if (!cfqg) { | |
2107 | - cfqd->serving_prio = IDLE_WORKLOAD; | |
2108 | - cfqd->workload_expires = jiffies + 1; | |
2109 | - return; | |
2110 | - } | |
2111 | - | |
2112 | 2106 | /* Choose next priority. RT > BE > IDLE */ |
2113 | 2107 | if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg)) |
2114 | 2108 | cfqd->serving_prio = RT_WORKLOAD; |