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/cgroup.c | |
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/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 7e5fee5d6422..6496a83b0314 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -4890,7 +4890,7 @@ int __init cgroup_init(void) | |||
4890 | */ | 4890 | */ |
4891 | if (!ss->disabled) { | 4891 | if (!ss->disabled) { |
4892 | cgrp_dfl_root.subsys_mask |= 1 << ss->id; | 4892 | cgrp_dfl_root.subsys_mask |= 1 << ss->id; |
4893 | WARN_ON(cgroup_add_cftypes(ss, ss->base_cftypes)); | 4893 | WARN_ON(cgroup_add_cftypes(ss, ss->legacy_cftypes)); |
4894 | } | 4894 | } |
4895 | } | 4895 | } |
4896 | 4896 | ||
@@ -5480,6 +5480,6 @@ static struct cftype debug_files[] = { | |||
5480 | struct cgroup_subsys debug_cgrp_subsys = { | 5480 | struct cgroup_subsys debug_cgrp_subsys = { |
5481 | .css_alloc = debug_css_alloc, | 5481 | .css_alloc = debug_css_alloc, |
5482 | .css_free = debug_css_free, | 5482 | .css_free = debug_css_free, |
5483 | .base_cftypes = debug_files, | 5483 | .legacy_cftypes = debug_files, |
5484 | }; | 5484 | }; |
5485 | #endif /* CONFIG_CGROUP_DEBUG */ | 5485 | #endif /* CONFIG_CGROUP_DEBUG */ |