Commit a557f1c7 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

bfq-iosched: relocate bfqg_*rwstat*() helpers 



Collect them right under #ifdef CONFIG_BFQ_CGROUP_DEBUG.  The next
patch will use them from !DEBUG path and this makes it easy to move
them out of the ifdef block.

This is pure code reorganization.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 912c0a85

block/bfq-cgroup.c

+23 −23
Original line number Diff line number Diff line
@@ -1058,17 +1058,34 @@ static ssize_t bfq_io_set_weight(struct kernfs_open_file *of, 
}



#ifdef CONFIG_BFQ_CGROUP_DEBUG

static int bfqg_print_stat(struct seq_file *sf, void *v)

static int bfqg_print_rwstat(struct seq_file *sf, void *v)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_stat,

			  &blkcg_policy_bfq, seq_cft(sf)->private, false);

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_rwstat,

			  &blkcg_policy_bfq, seq_cft(sf)->private, true);

	return 0;

}



static int bfqg_print_rwstat(struct seq_file *sf, void *v)

static u64 bfqg_prfill_rwstat_recursive(struct seq_file *sf,

					struct blkg_policy_data *pd, int off)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_rwstat,

			  &blkcg_policy_bfq, seq_cft(sf)->private, true);

	struct blkg_rwstat_sample sum;



	blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off, &sum);

	return __blkg_prfill_rwstat(sf, pd, &sum);

}



static int bfqg_print_rwstat_recursive(struct seq_file *sf, void *v)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),

			  bfqg_prfill_rwstat_recursive, &blkcg_policy_bfq,

			  seq_cft(sf)->private, true);

	return 0;

}



static int bfqg_print_stat(struct seq_file *sf, void *v)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)), blkg_prfill_stat,

			  &blkcg_policy_bfq, seq_cft(sf)->private, false);

	return 0;

}
@@ -1097,15 +1114,6 @@ static u64 bfqg_prfill_stat_recursive(struct seq_file *sf, 
	return __blkg_prfill_u64(sf, pd, sum);

}



static u64 bfqg_prfill_rwstat_recursive(struct seq_file *sf,

					struct blkg_policy_data *pd, int off)

{

	struct blkg_rwstat_sample sum;



	blkg_rwstat_recursive_sum(pd_to_blkg(pd), &blkcg_policy_bfq, off, &sum);

	return __blkg_prfill_rwstat(sf, pd, &sum);

}



static int bfqg_print_stat_recursive(struct seq_file *sf, void *v)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),
@@ -1114,14 +1122,6 @@ static int bfqg_print_stat_recursive(struct seq_file *sf, void *v) 
	return 0;

}



static int bfqg_print_rwstat_recursive(struct seq_file *sf, void *v)

{

	blkcg_print_blkgs(sf, css_to_blkcg(seq_css(sf)),

			  bfqg_prfill_rwstat_recursive, &blkcg_policy_bfq,

			  seq_cft(sf)->private, true);

	return 0;

}



static u64 bfqg_prfill_sectors(struct seq_file *sf, struct blkg_policy_data *pd,

			       int off)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE