sunrpc: simplify two-level sysctl registration for svcrdma_parm_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>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
index 5bc20e9d09cd84bb68e2fbea4c78f5591a2a60bc..f0d5eeed4c886f2d63cf6a83f4ed8add3c5ac9d8 100644 (file)
--- a/net/sunrpc/xprtrdma/svc_rdma.c
+++ b/net/sunrpc/xprtrdma/svc_rdma.c
@@ -212,24 +212,6 @@ static struct ctl_table svcrdma_parm_table[] = {
        { },
 };
 
-static struct ctl_table svcrdma_table[] = {
-       {
-               .procname       = "svc_rdma",
-               .mode           = 0555,
-               .child          = svcrdma_parm_table
-       },
-       { },
-};
-
-static struct ctl_table svcrdma_root_table[] = {
-       {
-               .procname       = "sunrpc",
-               .mode           = 0555,
-               .child          = svcrdma_table
-       },
-       { },
-};
-
 static void svc_rdma_proc_cleanup(void)
 {
        if (!svcrdma_table_header)
@@ -263,7 +245,8 @@ static int svc_rdma_proc_init(void)
        if (rc)
                goto out_err;
 
-       svcrdma_table_header = register_sysctl_table(svcrdma_root_table);
+       svcrdma_table_header = register_sysctl("sunrpc/svc_rdma",
+                                              svcrdma_parm_table);
        return 0;
 
 out_err: