diff options
| author | Tejun Heo | 2014-02-13 12:58:38 +0100 |
|---|---|---|
| committer | Tejun Heo | 2014-02-13 12:58:38 +0100 |
| commit | d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af (patch) | |
| tree | 17a4968e339822a520f864fe4127be39e0563f5c /include/linux/cgroup.h | |
| parent | sun4M: add include of slab.h for kzalloc (diff) | |
| download | kernel-qcow2-linux-d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af.tar.gz kernel-qcow2-linux-d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af.tar.xz kernel-qcow2-linux-d3ba07c3aa9ae3e03329b0a7f1a067c0647aa2af.zip | |
cgroup: disallow xattr, release_agent and name if sane_behavior
Disallow more mount options if sane_behavior. Note that xattr used to
generate warning.
While at it, simplify option check in cgroup_mount() and update
sane_behavior comment in cgroup.h.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 298d616e8f40..5f669ca0ee36 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -227,8 +227,8 @@ enum { * * The followings are the behaviors currently affected this flag. * - * - Mount options "noprefix" and "clone_children" are disallowed. - * Also, cgroupfs file cgroup.clone_children is not created. + * - Mount options "noprefix", "xattr", "clone_children", + * "release_agent" and "name" are disallowed. * * - When mounting an existing superblock, mount options should * match. @@ -246,7 +246,7 @@ enum { * - "release_agent" and "notify_on_release" are removed. * Replacement notification mechanism will be implemented. * - * - "xattr" mount option is deprecated. kernfs always enables it. + * - "cgroup.clone_children" is removed. * * - cpuset: tasks will be kept in empty cpusets when hotplug happens * and take masks of ancestors with non-empty cpus/mems, instead of |