devpts: simplify two-level sysctl registration for pty_kern_table

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

Simplify this registration.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>

diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 4f25015aa5342a332c76ad7d931a507784eea764..fe3db0eda8e47e00384ad352a97c9df360175a9a 100644 (file)
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -72,24 +72,6 @@ static struct ctl_table pty_table[] = {
        {}
 };
 
-static struct ctl_table pty_kern_table[] = {
-       {
-               .procname       = "pty",
-               .mode           = 0555,
-               .child          = pty_table,
-       },
-       {}
-};
-
-static struct ctl_table pty_root_table[] = {
-       {
-               .procname       = "kernel",
-               .mode           = 0555,
-               .child          = pty_kern_table,
-       },
-       {}
-};
-
 struct pts_mount_opts {
        int setuid;
        int setgid;
@@ -630,7 +612,7 @@ static int __init init_devpts_fs(void)
 {
        int err = register_filesystem(&devpts_fs_type);
        if (!err) {
-               register_sysctl_table(pty_root_table);
+               register_sysctl("kernel/pty", pty_table);
        }
        return err;
 }