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>

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 @@
 #define STATE_PENDING   1
 #define STATE_READY     2
 
-/* used by sysctl */
-#define FS_MQUEUE       1
-#define CTL_QUEUESMAX   2
-#define CTL_MSGMAX      3
-#define CTL_MSGSIZEMAX  4
-
 /* default values */
 #define DFLT_QUEUESMAX  256     /* max number of message queues */
 #define DFLT_MSGMAX     10      /* max number of messages in each queue */
@@ -1196,7 +1190,6 @@ static int msg_maxsize_limit_max = INT_MAX;
 
 static ctl_table mq_sysctls[] = {
         {
-                .ctl_name       = CTL_QUEUESMAX,
                 .procname       = "queues_max",
                 .data           = &queues_max,
                 .maxlen         = sizeof(int),
@@ -1204,7 +1197,6 @@ static ctl_table mq_sysctls[] = {
                 .proc_handler   = &proc_dointvec,
         },
         {
-                .ctl_name       = CTL_MSGMAX,
                 .procname       = "msg_max",
                 .data           = &msg_max,
                 .maxlen         = sizeof(int),
@@ -1214,7 +1206,6 @@ static ctl_table mq_sysctls[] = {
                 .extra2         = &msg_max_limit_max,
         },
         {
-                .ctl_name       = CTL_MSGSIZEMAX,
                 .procname       = "msgsize_max",
                 .data           = &msgsize_max,
                 .maxlen         = sizeof(int),
@@ -1228,7 +1219,6 @@ static ctl_table mq_sysctls[] = {
 
 static ctl_table mq_sysctl_dir[] = {
         {
-                .ctl_name       = FS_MQUEUE,
                 .procname       = "mqueue",
                 .mode           = 0555,
                 .child          = mq_sysctls,