aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-07-15 11:05:09 -0400
committerTejun Heo <tj@kernel.org>2014-07-15 11:05:09 -0400
commit2cf669a58dc08fa065a8bd0dca866c0e6cb358cc (patch)
tree2a04b009299fb4262791fb46e08f5623ab471e70 /kernel/cgroup.c
parent5577964e64692e17cc498854b7e0833e6532cd64 (diff)
cgroup: replace cgroup_add_cftypes() with cgroup_add_legacy_cftypes()
Currently, cftypes added by cgroup_add_cftypes() are 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 addition functions 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 adds cgroup_add_legacy_cftypes() which currently is a simple wrapper around cgroup_add_cftypes() and replaces all cgroup_add_cftypes() usages with it. While at it, this patch drops a completely spurious return from __hugetlb_cgroup_file_init(). This patch doesn't introduce any functional differences. 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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 6496a83b0314..c275aa439a6f 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3170,7 +3170,7 @@ int cgroup_rm_cftypes(struct cftype *cfts)
3170 * function currently returns 0 as long as @cfts registration is successful 3170 * function currently returns 0 as long as @cfts registration is successful
3171 * even if some file creation attempts on existing cgroups fail. 3171 * even if some file creation attempts on existing cgroups fail.
3172 */ 3172 */
3173int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts) 3173static int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
3174{ 3174{
3175 int ret; 3175 int ret;
3176 3176
@@ -3195,6 +3195,11 @@ int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
3195 return ret; 3195 return ret;
3196} 3196}
3197 3197
3198int cgroup_add_legacy_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
3199{
3200 return cgroup_add_cftypes(ss, cfts);
3201}
3202
3198/** 3203/**
3199 * cgroup_task_count - count the number of tasks in a cgroup. 3204 * cgroup_task_count - count the number of tasks in a cgroup.
3200 * @cgrp: the cgroup in question 3205 * @cgrp: the cgroup in question