From: Eric W. Biederman <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 08:34:07 +0000 (-0800)
Subject: [PATCH] sysctl: remove support for CTL_ANY
X-Git-Tag: v2.6.21-rc1~195
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6703ddfcce61ad66db606085a8d42dcab264f840;p=linux-2.6-omap-h63xx.git

[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 5b8af906979..51acdec88a6 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 fc2ce3d8f97..48708a73852 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))