Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5bd520 authored by Vivek Goyal's avatar Vivek Goyal Committed by Jens Axboe
Browse files

cfq: rename a function to give it more appropriate name 



o Rename a function to give it more approprate name. We are calculating
  cfq queue slice and function name gives the impression as if cfq group
  slice length is being calculated.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 68264e9d

block/cfq-iosched.c

+3 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ cfq_group_slice(struct cfq_data *cfqd, struct cfq_group *cfqg) 
}



static inline unsigned

cfq_scaled_group_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)

cfq_scaled_cfqq_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)

{

	unsigned slice = cfq_prio_to_slice(cfqd, cfqq);

	if (cfqd->cfq_latency) {
@@ -631,7 +631,7 @@ cfq_scaled_group_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq) 
static inline void

cfq_set_prio_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)

{

	unsigned slice = cfq_scaled_group_slice(cfqd, cfqq);

	unsigned slice = cfq_scaled_cfqq_slice(cfqd, cfqq);



	cfqq->slice_start = jiffies;

	cfqq->slice_end = jiffies + slice;
@@ -1671,7 +1671,7 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
	 */

	if (timed_out) {

		if (cfq_cfqq_slice_new(cfqq))

			cfqq->slice_resid = cfq_scaled_group_slice(cfqd, cfqq);

			cfqq->slice_resid = cfq_scaled_cfqq_slice(cfqd, cfqq);

		else

			cfqq->slice_resid = cfqq->slice_end - jiffies;

		cfq_log_cfqq(cfqd, cfqq, "resid=%ld", cfqq->slice_resid);