diff options
author | Tejun Heo <tj@kernel.org> | 2014-07-15 11:05:09 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-07-15 11:05:09 -0400 |
commit | 5577964e64692e17cc498854b7e0833e6532cd64 (patch) | |
tree | 92474a4bf3de98268a3af979130a88e934ea7345 /kernel/sched | |
parent | a14c6874be09a05a48093df8df87ca021f310332 (diff) |
cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
Currently, cgroup_subsys->base_cftypes is used for both the unified
default hierarchy and legacy ones and subsystems can mark each file
with either CFTYPE_ONLY_ON_DFL or CFTYPE_INSANE if it has to appear
only on one of them. This is quite hairy and error-prone. Also, we
may end up exposing interface files to the default hierarchy without
thinking it through.
cgroup_subsys will grow two separate cftype arrays and apply each only
on the hierarchies of the matching type. This will allow organizing
cftypes in a lot clearer way and encourage subsystems to scrutinize
the interface which is being exposed in the new default hierarchy.
In preparation, this patch renames cgroup_subsys->base_cftypes to
cgroup_subsys->legacy_cftypes. This patch is pure rename.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Aristeu Rozanski <aris@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/core.c | 2 | ||||
-rw-r--r-- | kernel/sched/cpuacct.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3bdf01b494fe..6628e8014824 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -8088,7 +8088,7 @@ struct cgroup_subsys cpu_cgrp_subsys = { | |||
8088 | .can_attach = cpu_cgroup_can_attach, | 8088 | .can_attach = cpu_cgroup_can_attach, |
8089 | .attach = cpu_cgroup_attach, | 8089 | .attach = cpu_cgroup_attach, |
8090 | .exit = cpu_cgroup_exit, | 8090 | .exit = cpu_cgroup_exit, |
8091 | .base_cftypes = cpu_files, | 8091 | .legacy_cftypes = cpu_files, |
8092 | .early_init = 1, | 8092 | .early_init = 1, |
8093 | }; | 8093 | }; |
8094 | 8094 | ||
diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c index 9cf350c94ec4..dd7cbb55bbf2 100644 --- a/kernel/sched/cpuacct.c +++ b/kernel/sched/cpuacct.c | |||
@@ -278,6 +278,6 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val) | |||
278 | struct cgroup_subsys cpuacct_cgrp_subsys = { | 278 | struct cgroup_subsys cpuacct_cgrp_subsys = { |
279 | .css_alloc = cpuacct_css_alloc, | 279 | .css_alloc = cpuacct_css_alloc, |
280 | .css_free = cpuacct_css_free, | 280 | .css_free = cpuacct_css_free, |
281 | .base_cftypes = files, | 281 | .legacy_cftypes = files, |
282 | .early_init = 1, | 282 | .early_init = 1, |
283 | }; | 283 | }; |