summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-07-09 10:08:08 -0400
committerTejun Heo <tj@kernel.org>2014-07-09 10:08:08 -0400
commitc1d5d42efdb3e0470c1cfd2fcb50bc3eae813283 (patch)
tree77b49111998033bd3eea869f2953c3bc14414118
parent7450e90bbb8d834c190cc8100d1cc41888358c7c (diff)
downloadlinux-stable-c1d5d42efdb3e0470c1cfd2fcb50bc3eae813283.tar.gz
linux-stable-c1d5d42efdb3e0470c1cfd2fcb50bc3eae813283.tar.bz2
linux-stable-c1d5d42efdb3e0470c1cfd2fcb50bc3eae813283.zip
cgroup: make interface file "cgroup.sane_behavior" legacy-only
"cgroup.sane_behavior" is added to help distinguishing whether sane_behavior is in effect or not. We now have the default hierarchy where the flag is always in effect and are planning to remove supporting sane behavior on the legacy hierarchies making this file on the default hierarchy rather pointless. Let's make it legacy only and thus always zero. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com>
-rw-r--r--kernel/cgroup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 5411fffa4b70..0ea54af6b133 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2470,9 +2470,7 @@ static int cgroup_release_agent_show(struct seq_file *seq, void *v)
static int cgroup_sane_behavior_show(struct seq_file *seq, void *v)
{
- struct cgroup *cgrp = seq_css(seq)->cgroup;
-
- seq_printf(seq, "%d\n", cgroup_sane_behavior(cgrp));
+ seq_puts(seq, "0\n");
return 0;
}
@@ -4126,7 +4124,7 @@ static struct cftype cgroup_base_files[] = {
},
{
.name = "cgroup.sane_behavior",
- .flags = CFTYPE_ONLY_ON_ROOT,
+ .flags = CFTYPE_INSANE | CFTYPE_ONLY_ON_ROOT,
.seq_show = cgroup_sane_behavior_show,
},
{