diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-02-14 00:34:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:59 -0800 |
| commit | 6703ddfcce61ad66db606085a8d42dcab264f840 (patch) | |
| tree | 5e142a12e33f5f29890878d7fb615fbe2f92cf7e | |
| parent | 2abc26fc6b6f60fc70d6957b842ef4e5f805df7b (diff) | |
| download | blackbird-op-linux-6703ddfcce61ad66db606085a8d42dcab264f840.tar.gz blackbird-op-linux-6703ddfcce61ad66db606085a8d42dcab264f840.zip | |
[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>
| -rw-r--r-- | include/linux/sysctl.h | 1 | ||||
| -rw-r--r-- | kernel/sysctl.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 5b8af9069797..51acdec88a61 100644 --- 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 fc2ce3d8f97e..48708a73852d 100644 --- 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)) |
