summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-07-09 10:08:07 -0400
committerTejun Heo <tj@kernel.org>2014-07-09 10:08:07 -0400
commit7450e90bbb8d834c190cc8100d1cc41888358c7c (patch)
tree41591667e456113e70ab72f00d7d26ab7d705877 /kernel/cgroup.c
parent1ced953b17bfaf54ec1499f8bbfdf31ab36453af (diff)
downloadlinux-stable-7450e90bbb8d834c190cc8100d1cc41888358c7c.tar.gz
linux-stable-7450e90bbb8d834c190cc8100d1cc41888358c7c.tar.bz2
linux-stable-7450e90bbb8d834c190cc8100d1cc41888358c7c.zip
cgroup: remove CGRP_ROOT_OPTION_MASK
cgroup_root->flags only contains CGRP_ROOT_* flags and there's no reason to mask the flags. Remove CGRP_ROOT_OPTION_MASK. This doesn't cause any behavior differences. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index cd02e99d5d3b..5411fffa4b70 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1490,11 +1490,10 @@ static int cgroup_remount(struct kernfs_root *kf_root, int *flags, char *data)
removed_mask = root->subsys_mask & ~opts.subsys_mask;
/* Don't allow flags or name to change at remount */
- if (((opts.flags ^ root->flags) & CGRP_ROOT_OPTION_MASK) ||
+ if ((opts.flags ^ root->flags) ||
(opts.name && strcmp(opts.name, root->name))) {
pr_err("option or name mismatch, new: 0x%x \"%s\", old: 0x%x \"%s\"\n",
- opts.flags & CGRP_ROOT_OPTION_MASK, opts.name ?: "",
- root->flags & CGRP_ROOT_OPTION_MASK, root->name);
+ opts.flags, opts.name ?: "", root->flags, root->name);
ret = -EINVAL;
goto out_unlock;
}
@@ -1762,7 +1761,7 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
goto out_unlock;
}
- if ((root->flags ^ opts.flags) & CGRP_ROOT_OPTION_MASK) {
+ if (root->flags ^ opts.flags) {
if ((root->flags | opts.flags) & CGRP_ROOT_SANE_BEHAVIOR) {
pr_err("sane_behavior: new mount options should match the existing superblock\n");
ret = -EINVAL;