From 2fd211b761626409439911f42417dbb1abf484c5 Mon Sep 17 00:00:00 2001 From: Jeff Liu Date: Sun, 26 May 2013 21:33:09 +0800 Subject: [PATCH] --- yaml --- r: 376559 b: refs/heads/master c: 2a0ff3fbe39bc93f719ff857e5a359d9780579ff h: refs/heads/master i: 376557: 2180c703085124e402a50c7780632863be5fc0a6 376555: 9bd6db1947f5cfcf367f2b7902d17e120c25afd8 376551: 497954fcb8623bb270040dd2d201fe9902f1ad2a 376543: 2bd19f7629818d766f56f8fa4b4be2bdb06db8cb v: v3 --- [refs] | 2 +- trunk/kernel/cgroup.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e7ea16b87fd0..79eebfd57143 100644 --- 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 index 31e9ef319070..a7c9e6ddb979 100644 --- 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 */