Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 62cf6918d66acca738688658e33f9686ab174d94

Authored by Li Zefan
Committed by Greg Kroah-Hartman
1 parent b71bb82900

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 <lizf@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -1175,10 +1175,10 @@
1175 1175  
1176 1176 /*
1177 1177 * If the 'all' option was specified select all the subsystems,
1178   - * otherwise 'all, 'none' and a subsystem name options were not
1179   - * specified, let's default to 'all'
  1178 + * otherwise if 'none', 'name=' and a subsystem name options
  1179 + * were not specified, let's default to 'all'
1180 1180 */
1181   - if (all_ss || (!all_ss && !one_ss && !opts->none)) {
  1181 + if (all_ss || (!one_ss && !opts->none && !opts->name)) {
1182 1182 for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
1183 1183 struct cgroup_subsys *ss = subsys[i];
1184 1184 if (ss == NULL)