cgroup: fix to allow mounting a hierarchy by name
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 32a8cf235e
(cgroup: make the mount options parsing more accurate)
This fixes the regression.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
This commit is contained in:
parent
305f3c8b20
commit
0d19ea8665
|
@ -1193,10 +1193,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the 'all' option was specified select all the subsystems,
|
* If the 'all' option was specified select all the subsystems,
|
||||||
* otherwise 'all, 'none' and a subsystem name options were not
|
* otherwise if 'none', 'name=' and a subsystem name options
|
||||||
* specified, let's default to 'all'
|
* 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++) {
|
for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
|
||||||
struct cgroup_subsys *ss = subsys[i];
|
struct cgroup_subsys *ss = subsys[i];
|
||||||
if (ss == NULL)
|
if (ss == NULL)
|
||||||
|
|
Loading…
Reference in New Issue