path: root/kernel
diff options
authorLi Zefan <>2011-12-27 14:25:55 +0800
committerGreg Kroah-Hartman <>2012-01-12 11:33:24 -0800
commitb5c66ace2892b73dc2a55c1d3360224f388841cc (patch)
treee64a92d753df18c0eabd873b007ced9def775584 /kernel
parentcf2f03e57c607a7863e6010ca9e5c4d08bc5b48c (diff)
cgroup: fix to allow mounting a hierarchy by name
commit 0d19ea866562e46989412a0676412fa0983c9ce7 upstream. If we mount a hierarchy with a specified name, the name is unique, and we can use it to mount the hierarchy without specifying its set of subsystem names. This feature is documented is Documentation/cgroups/cgroups.txt section 2.3 Here's an example: # mount -t cgroup -o cpuset,name=myhier xxx /cgroup1 # mount -t cgroup -o name=myhier xxx /cgroup2 But it was broken by commit 32a8cf235e2f192eb002755076994525cdbaa35a (cgroup: make the mount options parsing more accurate) This fixes the regression. Signed-off-by: Li Zefan <> Signed-off-by: Tejun Heo <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'kernel')
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index b7ab0b86a966..e4cbdfbc2b14 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1175,10 +1175,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
* If the 'all' option was specified select all the subsystems,
- * otherwise 'all, 'none' and a subsystem name options were not
- * specified, let's default to 'all'
+ * otherwise if 'none', 'name=' and a subsystem name options
+ * were not specified, let's default to 'all'
- if (all_ss || (!all_ss && !one_ss && !opts->none)) {
+ if (all_ss || (!one_ss && !opts->none && !opts->name)) {
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
struct cgroup_subsys *ss = subsys[i];
if (ss == NULL)