Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6: (43 commits)
  security/tomoyo: Remove now unnecessary handling of security_sysctl.
  security/tomoyo: Add a special case to handle accesses through the internal proc mount.
  sysctl: Drop & in front of every proc_handler.
  sysctl: Remove CTL_NONE and CTL_UNNUMBERED
  sysctl: kill dead ctl_handler definitions.
  sysctl: Remove the last of the generic binary sysctl support
  sysctl net: Remove unused binary sysctl code
  sysctl security/tomoyo: Don't look at ctl_name
  sysctl arm: Remove binary sysctl support
  sysctl x86: Remove dead binary sysctl support
  sysctl sh: Remove dead binary sysctl support
  sysctl powerpc: Remove dead binary sysctl support
  sysctl ia64: Remove dead binary sysctl support
  sysctl s390: Remove dead sysctl binary support
  sysctl frv: Remove dead binary sysctl support
  sysctl mips/lasat: Remove dead binary sysctl support
  sysctl drivers: Remove dead binary sysctl support
  sysctl crypto: Remove dead binary sysctl support
  sysctl security/keys: Remove dead binary sysctl support
  sysctl kernel: Remove binary sysctl logic
  ...

4 files changed, 37 insertions, 78 deletions

diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 42f9748ae093..e65dcc613339 100644
--- 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
diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
index 35fb68b9c8ec..5b8a8ff93a25 100644
--- a/net/sunrpc/xprtrdma/svc_rdma.c
+++ b/net/sunrpc/xprtrdma/svc_rdma.c
@@ -120,8 +120,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_max_requests,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_max_requests,
                 .extra2         = &max_max_requests
         },
@@ -130,8 +129,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_max_req_size,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_max_inline,
                 .extra2         = &max_max_inline
         },
@@ -140,8 +138,7 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &svcrdma_ord,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_ord,
                 .extra2         = &max_ord,
         },
@@ -151,67 +148,65 @@ static ctl_table svcrdma_parm_table[] = {
                 .data           = &rdma_stat_read,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_recv",
                 .data           = &rdma_stat_recv,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_write",
                 .data           = &rdma_stat_write,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_starve",
                 .data           = &rdma_stat_sq_starve,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_starve",
                 .data           = &rdma_stat_rq_starve,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_poll",
                 .data           = &rdma_stat_rq_poll,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_rq_prod",
                 .data           = &rdma_stat_rq_prod,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_poll",
                 .data           = &rdma_stat_sq_poll,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
+                .proc_handler   = read_reset_stat,
         },
         {
                 .procname       = "rdma_stat_sq_prod",
                 .data           = &rdma_stat_sq_prod,
                 .maxlen         = sizeof(atomic_t),
                 .mode           = 0644,
-                .proc_handler   = &read_reset_stat,
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = read_reset_stat,
         },
+        { },
 };
 
 static ctl_table svcrdma_table[] = {
@@ -220,21 +215,16 @@ static ctl_table svcrdma_table[] = {
                 .mode           = 0555,
                 .child          = svcrdma_parm_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 static ctl_table svcrdma_root_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = svcrdma_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 void svc_rdma_cleanup(void)
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 9a63f669ece4..7018eef1dcdd 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -86,79 +86,63 @@ static struct ctl_table_header *sunrpc_table_header;
 
 static ctl_table xr_tunables_table[] = {
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_slot_table_entries",
                 .data           = &xprt_rdma_slot_table_entries,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_slot_table_size,
                 .extra2         = &max_slot_table_size
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_max_inline_read",
                 .data           = &xprt_rdma_max_inline_read,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_max_inline_write",
                 .data           = &xprt_rdma_max_inline_write,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_inline_write_padding",
                 .data           = &xprt_rdma_inline_write_padding,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &zero,
                 .extra2         = &max_padding,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_memreg_strategy",
                 .data           = &xprt_rdma_memreg_strategy,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_memreg,
                 .extra2         = &max_memreg,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "rdma_pad_optimize",
                 .data           = &xprt_rdma_pad_optimize,
                 .maxlen         = sizeof(unsigned int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = proc_dointvec,
         },
+        { },
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = xr_tunables_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 #endif
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 37c5475ba258..04732d09013e 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,
+                .proc_handler   = proc_dointvec_minmax,
                 .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,
+                .proc_handler   = proc_dointvec_minmax,
                 .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,
+                .proc_handler   = proc_dointvec_minmax,
                 .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,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &xprt_min_resvport_limit,
                 .extra2         = &xprt_max_resvport_limit
         },
@@ -129,24 +121,18 @@ static ctl_table xs_tunables_table[] = {
                 .data           = &xs_tcp_fin_timeout,
                 .maxlen         = sizeof(xs_tcp_fin_timeout),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_jiffies,
-                .strategy       = sysctl_jiffies
-        },
-        {
-                .ctl_name = 0,
+                .proc_handler   = proc_dointvec_jiffies,
         },
+        { },
 };
 
 static ctl_table sunrpc_table[] = {
         {
-                .ctl_name       = CTL_SUNRPC,
                 .procname       = "sunrpc",
                 .mode           = 0555,
                 .child          = xs_tunables_table
         },
-        {
-                .ctl_name = 0,
-        },
+        { },
 };
 
 #endif