cfq-iosched: don't check cfqg in choose_service_tree()
PATCH 1/1 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.
--- block/cfq-iosched.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
block/cfq-iosched.c +0 -6
@@ -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 ;
Signature · 1 line
1.6.5.2
Quoted 4 lines · Gui Jianfeng
When
cfq_choose_cfqg()is called inselect_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 callchoose_service_tree()with cfqg == NULL.
Further, if cfqg was NULL, cfq_choose_cfqg would have dereferenced a NULL pointer and we wouldn't even get to choose_service_tree.
Quoted 7 lines · Gui Jianfeng
When
cfq_choose_cfqg()is called inselect_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 callchoose_service_tree()with cfqg == NULL.Signed-off-by Gui Jianfeng <[email protected]>---
Thanks Gui for the cleanup. This patch looks good to me.
Vivek
Quoted 23 lines
block/cfq-iosched.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)block/cfq-iosched.c +0
-6@@ -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 ;Signature · 1 line
1.6.5.2