Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61e57c0c authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

cgroup: fix seq_show_option merge with legacy_name 



When seq_show_option (commit a068acf2: "fs: create and use
seq_show_option for escaping") was merged, it did not correctly collide
with cgroup's addition of legacy_name (commit 3e1d2eed: "cgroup:
introduce cgroup_subsys->legacy_name") changes.

This fixes the reported name.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4e4adb2f

kernel/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -1342,7 +1342,7 @@ static int cgroup_show_options(struct seq_file *seq, 
	if (root != &cgrp_dfl_root)

		for_each_subsys(ss, ssid)

			if (root->subsys_mask & (1 << ssid))

				seq_show_option(seq, ss->name, NULL);

				seq_show_option(seq, ss->legacy_name, NULL);

	if (root->flags & CGRP_ROOT_NOPREFIX)

		seq_puts(seq, ",noprefix");

	if (root->flags & CGRP_ROOT_XATTR)