[PATCH] utsname: simplify one-level sysctl registration for uts_kern_table

Luis Chamberlain
2023-03-10T23:18:05Z

There is no need to declare an extra tables to just create directory,
this can be easily be done with a prefix path with register_sysctl().

Simplify this registration.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---

This is part of the effort to phase out calls that can recurse from
sysctl registration [0]. If you have a tree to take this in feel free
to take it, or I can take it too through sysclt-next. Let me know!

This file has no explicit maintainer, so I assume there is no tree.

If I so no one taking it I can take in as part of sysctl-next later.

[0] https://lore.kernel.org/all/20230310223947.3917711-1-mcgrof@kernel.org/T/#u

kernel/utsname_sysctl.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
index f50398cb790d..019e3a1566cf 100644
--- a/kernel/utsname_sysctl.c
+++ b/kernel/utsname_sysctl.c
@@ -123,15 +123,6 @@ static struct ctl_table uts_kern_table[] = {
{}
};

-static struct ctl_table uts_root_table[] = {
- {
- .procname = "kernel",
- .mode = 0555,
- .child = uts_kern_table,
- },
- {}
-};
-
#ifdef CONFIG_PROC_SYSCTL
/*
* Notify userspace about a change in a certain entry of uts_kern_table,
@@ -147,7 +138,7 @@ void uts_proc_notify(enum uts_proc proc)

static int __init utsname_sysctl_init(void)
{
- register_sysctl_table(uts_root_table);
+ register_sysctl("kernel", uts_kern_table);
return 0;
}

--
2.39.1