cfq-iosched: Rename few functions related to selecting workload
choose_service_tree() selects/sets both wl_class and wl_type. Rename it to choose_wl_class_and_type() to make it very clear. cfq_choose_wl() only selects and sets wl_type. It is easy to confuse it with choose_st(). So rename it to cfq_choose_wl_type() to make it clear what does it do. Just renaming. No functionality change. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
parent
34b98d03bd
commit
6d816ec7c8
|
@ -2490,7 +2490,7 @@ static void cfq_setup_merge(struct cfq_queue *cfqq, struct cfq_queue *new_cfqq)
|
|||
}
|
||||
}
|
||||
|
||||
static enum wl_type_t cfq_choose_wl(struct cfq_data *cfqd,
|
||||
static enum wl_type_t cfq_choose_wl_type(struct cfq_data *cfqd,
|
||||
struct cfq_group *cfqg, enum wl_class_t wl_class)
|
||||
{
|
||||
struct cfq_queue *queue;
|
||||
|
@ -2513,7 +2513,8 @@ static enum wl_type_t cfq_choose_wl(struct cfq_data *cfqd,
|
|||
return cur_best;
|
||||
}
|
||||
|
||||
static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg)
|
||||
static void
|
||||
choose_wl_class_and_type(struct cfq_data *cfqd, struct cfq_group *cfqg)
|
||||
{
|
||||
unsigned slice;
|
||||
unsigned count;
|
||||
|
@ -2551,7 +2552,7 @@ static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg)
|
|||
|
||||
new_workload:
|
||||
/* otherwise select new workload type */
|
||||
cfqd->serving_wl_type = cfq_choose_wl(cfqd, cfqg,
|
||||
cfqd->serving_wl_type = cfq_choose_wl_type(cfqd, cfqg,
|
||||
cfqd->serving_wl_class);
|
||||
st = st_for(cfqg, cfqd->serving_wl_class, cfqd->serving_wl_type);
|
||||
count = st->count;
|
||||
|
@ -2621,7 +2622,7 @@ static void cfq_choose_cfqg(struct cfq_data *cfqd)
|
|||
} else
|
||||
cfqd->workload_expires = jiffies - 1;
|
||||
|
||||
choose_service_tree(cfqd, cfqg);
|
||||
choose_wl_class_and_type(cfqd, cfqg);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue