aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-18 06:05:24 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 17:37:22 -0400
commit97aeacf49239d7f829b8cbfaca05530c97ccb903 (patch)
tree2a13ee8cdebc8c0bdf66459213cbc431eef78216
parent49a0c45833c9aa9852ba02c9df0f18029509d0a9 (diff)
sysctl mqueue: remove the binary sysctl numbers
Because of a conflict with FS_INODE_NR none of the binary sysctl numbers use by mqueue, were available to user space. So just remove them. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Cc: Alexey Dobriyan <adobriyan@sw.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--ipc/mqueue.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 774843cff756..20f1fed8fa48 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -44,12 +44,6 @@
44#define STATE_PENDING 1 44#define STATE_PENDING 1
45#define STATE_READY 2 45#define STATE_READY 2
46 46
47/* used by sysctl */
48#define FS_MQUEUE 1
49#define CTL_QUEUESMAX 2
50#define CTL_MSGMAX 3
51#define CTL_MSGSIZEMAX 4
52
53/* default values */ 47/* default values */
54#define DFLT_QUEUESMAX 256 /* max number of message queues */ 48#define DFLT_QUEUESMAX 256 /* max number of message queues */
55#define DFLT_MSGMAX 10 /* max number of messages in each queue */ 49#define DFLT_MSGMAX 10 /* max number of messages in each queue */
@@ -1196,7 +1190,6 @@ static int msg_maxsize_limit_max = INT_MAX;
1196 1190
1197static ctl_table mq_sysctls[] = { 1191static ctl_table mq_sysctls[] = {
1198 { 1192 {
1199 .ctl_name = CTL_QUEUESMAX,
1200 .procname = "queues_max", 1193 .procname = "queues_max",
1201 .data = &queues_max, 1194 .data = &queues_max,
1202 .maxlen = sizeof(int), 1195 .maxlen = sizeof(int),
@@ -1204,7 +1197,6 @@ static ctl_table mq_sysctls[] = {
1204 .proc_handler = &proc_dointvec, 1197 .proc_handler = &proc_dointvec,
1205 }, 1198 },
1206 { 1199 {
1207 .ctl_name = CTL_MSGMAX,
1208 .procname = "msg_max", 1200 .procname = "msg_max",
1209 .data = &msg_max, 1201 .data = &msg_max,
1210 .maxlen = sizeof(int), 1202 .maxlen = sizeof(int),
@@ -1214,7 +1206,6 @@ static ctl_table mq_sysctls[] = {
1214 .extra2 = &msg_max_limit_max, 1206 .extra2 = &msg_max_limit_max,
1215 }, 1207 },
1216 { 1208 {
1217 .ctl_name = CTL_MSGSIZEMAX,
1218 .procname = "msgsize_max", 1209 .procname = "msgsize_max",
1219 .data = &msgsize_max, 1210 .data = &msgsize_max,
1220 .maxlen = sizeof(int), 1211 .maxlen = sizeof(int),
@@ -1228,7 +1219,6 @@ static ctl_table mq_sysctls[] = {
1228 1219
1229static ctl_table mq_sysctl_dir[] = { 1220static ctl_table mq_sysctl_dir[] = {
1230 { 1221 {
1231 .ctl_name = FS_MQUEUE,
1232 .procname = "mqueue", 1222 .procname = "mqueue",
1233 .mode = 0555, 1223 .mode = 0555,
1234 .child = mq_sysctls, 1224 .child = mq_sysctls,