2 files changed, 15 insertions, 9 deletions

diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
index 383d638340b8..5bb8bfe67149 100644
--- a/ipc/mq_sysctl.c
+++ b/ipc/mq_sysctl.c
@@ -22,6 +22,16 @@ static void *get_mq(ctl_table *table)
         return which;
 }
 
+static int proc_mq_dointvec(ctl_table *table, int write,
+                            void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+        struct ctl_table mq_table;
+        memcpy(&mq_table, table, sizeof(mq_table));
+        mq_table.data = get_mq(table);
+
+        return proc_dointvec(&mq_table, write, buffer, lenp, ppos);
+}
+
 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
         void __user *buffer, size_t *lenp, loff_t *ppos)
 {
@@ -33,12 +43,10 @@ static int proc_mq_dointvec_minmax(ctl_table *table, int write,
                                         lenp, ppos);
 }
 #else
+#define proc_mq_dointvec NULL
 #define proc_mq_dointvec_minmax NULL
 #endif
 
-static int msg_queues_limit_min = MIN_QUEUESMAX;
-static int msg_queues_limit_max = HARD_QUEUESMAX;
-
 static int msg_max_limit_min = MIN_MSGMAX;
 static int msg_max_limit_max = HARD_MSGMAX;
 
@@ -51,9 +59,7 @@ static ctl_table mq_sysctls[] = {
                 .data           = &init_ipc_ns.mq_queues_max,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = proc_mq_dointvec_minmax,
-                .extra1         = &msg_queues_limit_min,
-                .extra2         = &msg_queues_limit_max,
+                .proc_handler   = proc_mq_dointvec,
         },
         {
                 .procname       = "msg_max",
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index ccf1f9fd263a..c3b31179122c 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -433,9 +433,9 @@ static int mqueue_create(struct inode *dir, struct dentry *dentry,
                 error = -EACCES;
                 goto out_unlock;
         }
-        if (ipc_ns->mq_queues_count >= HARD_QUEUESMAX ||
-            (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max &&
-             !capable(CAP_SYS_RESOURCE))) {
+
+        if (ipc_ns->mq_queues_count >= ipc_ns->mq_queues_max &&
+            !capable(CAP_SYS_RESOURCE)) {
                 error = -ENOSPC;
                 goto out_unlock;
         }