nfs: simplify two-level sysctl registration for nfs_cb_sysctls

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>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/sysctl.c b/fs/nfs/sysctl.c
index 7aea195..f39e208 100644 (file)
--- a/fs/nfs/sysctl.c
+++ b/fs/nfs/sysctl.c
@@ -32,27 +32,9 @@ static struct ctl_table nfs_cb_sysctls[] = {
        { }
 };
 
-static struct ctl_table nfs_cb_sysctl_dir[] = {
-       {
-               .procname = "nfs",
-               .mode = 0555,
-               .child = nfs_cb_sysctls,
-       },
-       { }
-};
-
-static struct ctl_table nfs_cb_sysctl_root[] = {
-       {
-               .procname = "fs",
-               .mode = 0555,
-               .child = nfs_cb_sysctl_dir,
-       },
-       { }
-};
-
 int nfs_register_sysctl(void)
 {
-       nfs_callback_sysctl_table = register_sysctl_table(nfs_cb_sysctl_root);
+       nfs_callback_sysctl_table = register_sysctl("fs/nfs", nfs_cb_sysctls);
        if (nfs_callback_sysctl_table == NULL)
                return -ENOMEM;
        return 0;