diff options
author | Tejun Heo <tj@kernel.org> | 2012-04-01 17:38:43 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2012-04-01 17:38:43 -0400 |
commit | c4682aec9caaca1fcfd1dd4b59cef47af22cbdc6 (patch) | |
tree | 6e20981d877cf3dab29eb265f36edbd309f23761 /block/blk-cgroup.h | |
parent | 627f29f48158c3088cc55a25d8650cae455ff63b (diff) |
blkcg: restructure configuration printing
Similarly to the previous stat restructuring, this patch restructures
conf printing code such that,
* Conf printing uses the same helpers as stat.
* Printing function doesn't require hardcoded switching on the config
being printed. Note that this isn't complete yet for throttle
confs. The next patch will convert setting for these confs and will
complete the transition.
* Printing uses read_seq_string callback (other methods will be phased
out).
Note that blkio_group_conf.iops[2] is changed to u64 so that they can
be manipulated with the same functions. This is transitional and will
go away later.
After this patch, per-device configurations - weight, bps and iops -
use __blkg_prfill_u64() for printing which uses white space as
delimiter instead of tab.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'block/blk-cgroup.h')
-rw-r--r-- | block/blk-cgroup.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 7331d7965a5e..b67eefa706c3 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h | |||
@@ -52,7 +52,6 @@ enum blkg_state_flags { | |||
52 | 52 | ||
53 | /* cgroup files owned by proportional weight policy */ | 53 | /* cgroup files owned by proportional weight policy */ |
54 | enum blkcg_file_name_prop { | 54 | enum blkcg_file_name_prop { |
55 | BLKIO_PROP_weight = 1, | ||
56 | BLKIO_PROP_weight_device, | 55 | BLKIO_PROP_weight_device, |
57 | }; | 56 | }; |
58 | 57 | ||
@@ -130,7 +129,7 @@ struct blkio_group_stats_cpu { | |||
130 | 129 | ||
131 | struct blkio_group_conf { | 130 | struct blkio_group_conf { |
132 | unsigned int weight; | 131 | unsigned int weight; |
133 | unsigned int iops[2]; | 132 | u64 iops[2]; |
134 | u64 bps[2]; | 133 | u64 bps[2]; |
135 | }; | 134 | }; |
136 | 135 | ||