merge sock_alloc_fd/sock_attach_fd into a new helper

[safe/jmp/linux-2.6] / net / sunrpc / sysctl.c

diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 42f9748..e65dcc6 100644 (file)
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -139,46 +139,45 @@ static ctl_table debug_table[] = {
                .data           = &rpc_debug,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dodebug
+               .proc_handler   = proc_dodebug
        },
        {
                .procname       = "nfs_debug",
                .data           = &nfs_debug,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dodebug
+               .proc_handler   = proc_dodebug
        },
        {
                .procname       = "nfsd_debug",
                .data           = &nfsd_debug,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dodebug
+               .proc_handler   = proc_dodebug
        },
        {
                .procname       = "nlm_debug",
                .data           = &nlm_debug,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dodebug
+               .proc_handler   = proc_dodebug
        },
        {
                .procname       = "transports",
                .maxlen         = 256,
                .mode           = 0444,
-               .proc_handler   = &proc_do_xprt,
+               .proc_handler   = proc_do_xprt,
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 static ctl_table sunrpc_table[] = {
        {
-               .ctl_name       = CTL_SUNRPC,
                .procname       = "sunrpc",
                .mode           = 0555,
                .child          = debug_table
        },
-       { .ctl_name = 0 }
+       { }
 };
 
 #endif