[PATCH] sysctl: remove support for CTL_ANY

There are currently no users in the kernel for CTL_ANY and it only has effect
on the binary interface which is practically unused.

So this complicates sysctl lookups for no good reason so just remove it.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 5b8af9069797fe1ea209940ceff433ff7fd0019c..51acdec88a61e24ce3721808987ef013a95135ec 100644 (file)
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -53,7 +53,6 @@ struct __sysctl_args {
 
 /* For internal pattern-matching use only: */
 #ifdef __KERNEL__
-#define CTL_ANY                -1      /* Matches any name */
 #define CTL_NONE       0
 #define CTL_UNNUMBERED CTL_NONE        /* sysctl without a binary number */
 #endif

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index fc2ce3d8f97e8ba8d4152e87161af24c9e4e946d..48708a73852d6d3d61f9c115b69bd2f1aab37a97 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1170,7 +1170,7 @@ repeat:
        for ( ; table->ctl_name || table->procname; table++) {
                if (!table->ctl_name)
                        continue;
-               if (n == table->ctl_name || table->ctl_name == CTL_ANY) {
+               if (n == table->ctl_name) {
                        int error;
                        if (table->child) {
                                if (ctl_perm(table, 001))