sysctl net: Remove unused binary sysctl code

Now that sys_sysctl is a compatiblity wrapper around /proc/sys
all sysctl strategy routines, and all ctl_name and strategy
entries in the sysctl tables are unused, and can be
revmoed.

In addition neigh_sysctl_register has been modified to no longer
take a strategy argument and it's callers have been modified not
to pass one.

Cc: "David Miller" <davem@davemloft.net>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

1 files changed, 2 insertions, 16 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 37c5475ba258..8b9a2079f2e3 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -81,46 +81,38 @@ static struct ctl_table_header *sunrpc_table_header;
  */
 static ctl_table xs_tunables_table[] = {
         {
-                .ctl_name       = CTL_SLOTTABLE_UDP,
                 .procname       = "udp_slot_table_entries",
                 .data           = &xprt_udp_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_SLOTTABLE_TCP,
                 .procname       = "tcp_slot_table_entries",
                 .data           = &xprt_tcp_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_MIN_RESVPORT,
                 .procname       = "min_resvport",
                 .data           = &xprt_min_resvport,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
                 .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
         {
-                .ctl_name       = CTL_MAX_RESVPORT,
                 .procname       = "max_resvport",
                 .data           = &xprt_max_resvport,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
                 .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
@@ -130,23 +122,17 @@ static ctl_table xs_tunables_table[] = {
                 .maxlen         = sizeof(xs_tcp_fin_timeout),
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies
-        },
-        {
-                .ctl_name = 0,
         },
+        { },
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = xs_tunables_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 #endif