From: Tejun Heo <tj@kernel.org>
Date: Fri, 14 Jun 2013 02:38:26 +0000 (-0700)
Subject: Merge branch 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu... 
X-Git-Tag: firefly_0821_release~176^2~5813^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.11' of git://git./linux/kernel/git/tj/percpu into for-3.11

This is to receive percpu_refcount which will replace atomic_t
reference count in cgroup_subsys_state.

Signed-off-by: Tejun Heo <tj@kernel.org>
---

2b0e53a7c8a6972755c0f0152d7fad2289fdc5eb
diff --cc kernel/cgroup.c
index df6814706cca,a7c9e6ddb979..ebbfc043153f
--- 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 */