From: Tejun Heo <tj@kernel.org>
Date: Tue, 28 May 2013 22:59:56 +0000 (+0900)
Subject: Merge branch 'for-3.10-fixes' into for-next
X-Git-Tag: next-20130607~51^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9ed7c6720ef89da6fbcd12120fc24c6a7b01bcb;p=karo-tx-linux.git

Merge branch 'for-3.10-fixes' into for-next
---

d9ed7c6720ef89da6fbcd12120fc24c6a7b01bcb
diff --cc kernel/cgroup.c
index fefc41c1a147,a7c9e6ddb979..d4ddc106c805
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -1686,13 -1684,16 +1686,16 @@@ static struct dentry *cgroup_mount(stru
  		 * We re-used an existing hierarchy - the new root (if
  		 * any) is not needed
  		 */
 -		cgroup_drop_root(opts.new_root);
 +		cgroup_free_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 */