]> git.baikalelectronics.ru Git - kernel.git/commit
cgroup: fix seq_show_option merge with legacy_name
authorKees Cook <keescook@chromium.org>
Tue, 8 Sep 2015 21:58:22 +0000 (14:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Sep 2015 22:35:28 +0000 (15:35 -0700)
commitda3811e23b6e4686485c7bc53f3dcdd37da24da2
tree8a0fa75480253ab808a0c285d8f86a57335d9e63
parent22882c7ee5add04f0e3effddbe1232b6fe0eff2c
cgroup: fix seq_show_option merge with legacy_name

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

This fixes the reported name.

Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/cgroup.c