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

Commit 689665af authored by Tejun Heo's avatar Tejun Heo
Browse files

cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats() 



Separate out cfqg_stats_reset() which takes struct cfqg_stats * from
cfq_pd_reset_stats() and move the latter to where other pd methods are
defined.  cfqg_stats_reset() will be used to implement hierarchical
stats.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
parent 810ecfa7

block/cfq-iosched.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -688,11 +688,9 @@ static inline void cfqg_stats_update_completion(struct cfq_group *cfqg, 
				io_start_time - start_time);

				io_start_time - start_time);

}

}





static void cfq_pd_reset_stats(struct blkcg_gq *blkg)

/* @stats = 0 */

static void cfqg_stats_reset(struct cfqg_stats *stats)

{

{

	struct cfq_group *cfqg = blkg_to_cfqg(blkg);

	struct cfqg_stats *stats = &cfqg->stats;



	/* queued stats shouldn't be cleared */

	/* queued stats shouldn't be cleared */

	blkg_rwstat_reset(&stats->service_bytes);

	blkg_rwstat_reset(&stats->service_bytes);

	blkg_rwstat_reset(&stats->serviced);

	blkg_rwstat_reset(&stats->serviced);
@@ -1477,6 +1475,13 @@ static void cfq_pd_init(struct blkcg_gq *blkg) 
	cfqg->leaf_weight = blkg->blkcg->cfq_leaf_weight;

	cfqg->leaf_weight = blkg->blkcg->cfq_leaf_weight;

}

}





static void cfq_pd_reset_stats(struct blkcg_gq *blkg)

{

	struct cfq_group *cfqg = blkg_to_cfqg(blkg);



	cfqg_stats_reset(&cfqg->stats);

}



/*

/*

 * Search for the cfq group current task belongs to. request_queue lock must

 * Search for the cfq group current task belongs to. request_queue lock must

 * be held.

 * be held.