---

yaml --- r: 376559 b: refs/heads/master c: 2a0ff3f h: refs/heads/master i: 376557: 2180c70 376555: 9bd6db1 376551: 497954f 376543: 2bd19f7 v: v3
git-mirror · May 28, 2013 · 2fd211b · 2fd211b
1 parent ce10250
commit 2fd211b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7805d000db30a3787a4c969bab6ae4d8a5fd8ce6
+refs/heads/master: 2a0ff3fbe39bc93f719ff857e5a359d9780579ff
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -1686,11 +1686,14 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
 		 */
 		cgroup_drop_root(opts.new_root);
 
-		if (((root->flags | opts.flags) & CGRP_ROOT_SANE_BEHAVIOR) &&
-		    root->flags != opts.flags) {
-			pr_err("cgroup: sane_behavior: new mount options should match the existing superblock\n");
-			ret = -EINVAL;
-			goto drop_new_super;
+		if (root->flags != opts.flags) {
+			if ((root->flags | opts.flags) & CGRP_ROOT_SANE_BEHAVIOR) {
+				pr_err("cgroup: sane_behavior: new mount options should match the existing superblock\n");
+				ret = -EINVAL;
+				goto drop_new_super;
+			} else {
+				pr_warning("cgroup: new mount options do not match the existing superblock, will be ignored\n");
+			}
 		}
 
 		/* no subsys rebinding, so refcounts don't change */