diff options
author | Tejun Heo <tj@kernel.org> | 2013-12-05 12:28:01 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-12-05 12:28:01 -0500 |
commit | 44ffc75ba9a63f972dbebd4fab6888db5fcd3b0e (patch) | |
tree | 74e59dc41c550c3013e4ed1ec651557f8acfceee /kernel/sched/core.c | |
parent | afb2bc14e1c989cf0635bd04edb5ff55b8c1c7bd (diff) |
cgroup, sched: convert away from cftype->read_map()
In preparation of conversion to kernfs, cgroup file handling is being
consolidated so that it can be easily mapped to the seq_file based
interface of kernfs.
cftype->read_map() doesn't add any value and being replaced with
->read_seq_string(). Update cpu_stats_show() and cpuacct_stats_show()
accordingly.
This patch doesn't make any visible behavior changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index c1808606ee5f..f28ec6722f0b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -7257,14 +7257,14 @@ static int __cfs_schedulable(struct task_group *tg, u64 period, u64 quota) | |||
7257 | } | 7257 | } |
7258 | 7258 | ||
7259 | static int cpu_stats_show(struct cgroup_subsys_state *css, struct cftype *cft, | 7259 | static int cpu_stats_show(struct cgroup_subsys_state *css, struct cftype *cft, |
7260 | struct cgroup_map_cb *cb) | 7260 | struct seq_file *sf) |
7261 | { | 7261 | { |
7262 | struct task_group *tg = css_tg(css); | 7262 | struct task_group *tg = css_tg(css); |
7263 | struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; | 7263 | struct cfs_bandwidth *cfs_b = &tg->cfs_bandwidth; |
7264 | 7264 | ||
7265 | cb->fill(cb, "nr_periods", cfs_b->nr_periods); | 7265 | seq_printf(sf, "nr_periods %d\n", cfs_b->nr_periods); |
7266 | cb->fill(cb, "nr_throttled", cfs_b->nr_throttled); | 7266 | seq_printf(sf, "nr_throttled %d\n", cfs_b->nr_throttled); |
7267 | cb->fill(cb, "throttled_time", cfs_b->throttled_time); | 7267 | seq_printf(sf, "throttled_time %llu\n", cfs_b->throttled_time); |
7268 | 7268 | ||
7269 | return 0; | 7269 | return 0; |
7270 | } | 7270 | } |
@@ -7318,7 +7318,7 @@ static struct cftype cpu_files[] = { | |||
7318 | }, | 7318 | }, |
7319 | { | 7319 | { |
7320 | .name = "stat", | 7320 | .name = "stat", |
7321 | .read_map = cpu_stats_show, | 7321 | .read_seq_string = cpu_stats_show, |
7322 | }, | 7322 | }, |
7323 | #endif | 7323 | #endif |
7324 | #ifdef CONFIG_RT_GROUP_SCHED | 7324 | #ifdef CONFIG_RT_GROUP_SCHED |