lockd: simplify two-level sysctl registration for nlm_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/lockd/svc.c b/fs/lockd/svc.c
index 9a47303..bb94949 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -510,24 +510,6 @@ static struct ctl_table nlm_sysctls[] = {
        { }
 };
 
-static struct ctl_table nlm_sysctl_dir[] = {
-       {
-               .procname       = "nfs",
-               .mode           = 0555,
-               .child          = nlm_sysctls,
-       },
-       { }
-};
-
-static struct ctl_table nlm_sysctl_root[] = {
-       {
-               .procname       = "fs",
-               .mode           = 0555,
-               .child          = nlm_sysctl_dir,
-       },
-       { }
-};
-
 #endif /* CONFIG_SYSCTL */
 
 /*
@@ -644,7 +626,7 @@ static int __init init_nlm(void)
 
 #ifdef CONFIG_SYSCTL
        err = -ENOMEM;
-       nlm_sysctl_table = register_sysctl_table(nlm_sysctl_root);
+       nlm_sysctl_table = register_sysctl("fs/nfs", nlm_sysctls);
        if (nlm_sysctl_table == NULL)
                goto err_sysctl;
 #endif