[PATCH v2] cgroup: use legacy_name for cgroup v1 disable info

From: Kamalesh Babulal
Date: Fri Oct 06 2023 - 07:51:32 EST


cgroup v1 or v2 or both controller names can be passed as arguments to
the 'cgroup_no_v1' kernel parameter, though most of the controller's
names are the same for both cgroup versions. This can be confusing when
both versions are used interchangeably, i.e., passing cgroup_no_v1=io

$ sudo dmesg |grep cgroup
...
cgroup: Disabling io control group subsystem in v1 mounts
cgroup: Disabled controller 'blkio'

Make it consistent across the pr_info()'s, by using ss->legacy_name, as
the subsystem name, while printing the cgroup v1 controller disabling
information in cgroup_init().

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@xxxxxxxxxx>
---
v2 changes:
- Dropped the subsys name comparison with ss->legacy_name only while
parsing cgroup_no_v1 cmdline
- Adapt the commit subject to match the partial change

kernel/cgroup/cgroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 1fb7f562289d..622fb53a806b 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6121,7 +6121,7 @@ int __init cgroup_init(void)

if (cgroup1_ssid_disabled(ssid))
pr_info("Disabling %s control group subsystem in v1 mounts\n",
- ss->name);
+ ss->legacy_name);

cgrp_dfl_root.subsys_mask |= 1 << ss->id;


base-commit: b78b18fb8ee19f7a05f20c3abc865b3bfe182884
--
2.41.0