sysctl security/keys: Remove dead binary sysctl support

Now that sys_sysctl is a generic wrapper around /proc/sys  .ctl_name
and .strategy members of sysctl tables are dead code.  Remove them.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c
index 5e05dc09e2dba0109ab931a57fecb97a4c017be9..3565e2fc10c98a35a3ed98103301c679abb0960b 100644 (file)
--- a/security/keys/sysctl.c
+++ b/security/keys/sysctl.c
@@ -17,7 +17,6 @@ static const int zero, one = 1, max = INT_MAX;
 
 ctl_table key_sysctls[] = {
        {
-               .ctl_name = CTL_UNNUMBERED,
                .procname = "maxkeys",
                .data = &key_quota_maxkeys,
                .maxlen = sizeof(unsigned),
@@ -27,7 +26,6 @@ ctl_table key_sysctls[] = {
                .extra2 = (void *) &max,
        },
        {
-               .ctl_name = CTL_UNNUMBERED,
                .procname = "maxbytes",
                .data = &key_quota_maxbytes,
                .maxlen = sizeof(unsigned),
@@ -37,7 +35,6 @@ ctl_table key_sysctls[] = {
                .extra2 = (void *) &max,
        },
        {
-               .ctl_name = CTL_UNNUMBERED,
                .procname = "root_maxkeys",
                .data = &key_quota_root_maxkeys,
                .maxlen = sizeof(unsigned),
@@ -47,7 +44,6 @@ ctl_table key_sysctls[] = {
                .extra2 = (void *) &max,
        },
        {
-               .ctl_name = CTL_UNNUMBERED,
                .procname = "root_maxbytes",
                .data = &key_quota_root_maxbytes,
                .maxlen = sizeof(unsigned),
@@ -57,7 +53,6 @@ ctl_table key_sysctls[] = {
                .extra2 = (void *) &max,
        },
        {
-               .ctl_name = CTL_UNNUMBERED,
                .procname = "gc_delay",
                .data = &key_gc_delay,
                .maxlen = sizeof(unsigned),
@@ -66,5 +61,5 @@ ctl_table key_sysctls[] = {
                .extra1 = (void *) &zero,
                .extra2 = (void *) &max,
        },
-       { .ctl_name = 0 }
+       { }
 };