diff options
| author |   Tejun Heo <tj@kernel.org> | 2014-02-12 09:29:48 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-12 09:29:48 -0500 |
| commit | 86bf4b68759141459864ebd36ac3038a9cda895b (patch) | |
| tree | 81c1bfe990c4752f5056c9df02258391fc9ca464 | |
| parent | cgroup: convert to kernfs (diff) | |
| download | linux-dev-86bf4b68759141459864ebd36ac3038a9cda895b.tar.xz linux-dev-86bf4b68759141459864ebd36ac3038a9cda895b.zip | |
cgroup: warn if "xattr" is specified with "sane_behavior"
Mount option "xattr" is no longer necessary as it's enabled by default
on kernfs. Warn if "xattr" is specified with "sane_behavior" so that
the option can be removed in the future.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
| -rw-r--r-- | include/linux/cgroup.h | 2 | ||||
| -rw-r--r-- | kernel/cgroup.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0e45a932b823..305e94ee17f5 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -264,6 +264,8 @@ enum { * - "release_agent" and "notify_on_release" are removed. * Replacement notification mechanism will be implemented. * + * - "xattr" mount option is deprecated. kernfs always enables it. + * * - cpuset: tasks will be kept in empty cpusets when hotplug happens * and take masks of ancestors with non-empty cpus/mems, instead of * being moved to an ancestor. diff --git a/kernel/cgroup.c b/kernel/cgroup.c index cda614da40cf..a0fab71f200f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1267,6 +1267,9 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) pr_err("cgroup: sane_behavior: clone_children is not allowed\n"); return -EINVAL; } + + if (opts->flags & CGRP_ROOT_XATTR) + pr_warning("cgroup: sane_behavior: xattr is always available, flag unnecessary\n"); } /* |