From 90b201491d38930de20bb7d87c1c70034aba7ade Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 9 Dec 2011 00:38:50 -0500
Subject: [PATCH] --- yaml --- r: 276647 b: refs/heads/master c:
 6f686574cccc2ef66fb38e41f19cedd81e7b4504 h: refs/heads/master i:   276645:
 3a6a9ea05c845882423e08004341a9639c6919f4   276643:
 c98ea64d81fe2825abcb9bff6d2c1c818a506032   276639:
 db1267e0f63d434e1aac359056e6950c307ca271 v: v3

---
 [refs]              | 2 +-
 trunk/ipc/mqueue.c  | 8 +++-----
 trunk/ipc/msgutil.c | 5 -----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 506fae50c41f..78b5ae70c752 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 905ad269c55fc62bee3da29f7b1d1efeba8aa1e1
+refs/heads/master: 6f686574cccc2ef66fb38e41f19cedd81e7b4504
diff --git a/trunk/ipc/mqueue.c b/trunk/ipc/mqueue.c
index 2e0ecfcc881d..5b4293d9819d 100644
--- a/trunk/ipc/mqueue.c
+++ b/trunk/ipc/mqueue.c
@@ -1269,7 +1269,7 @@ void mq_clear_sbinfo(struct ipc_namespace *ns)
 
 void mq_put_mnt(struct ipc_namespace *ns)
 {
-	mntput(ns->mq_mnt);
+	kern_unmount(ns->mq_mnt);
 }
 
 static int __init init_mqueue_fs(void)
@@ -1291,11 +1291,9 @@ static int __init init_mqueue_fs(void)
 
 	spin_lock_init(&mq_lock);
 
-	init_ipc_ns.mq_mnt = kern_mount_data(&mqueue_fs_type, &init_ipc_ns);
-	if (IS_ERR(init_ipc_ns.mq_mnt)) {
-		error = PTR_ERR(init_ipc_ns.mq_mnt);
+	error = mq_init_ns(&init_ipc_ns);
+	if (error)
 		goto out_filesystem;
-	}
 
 	return 0;
 
diff --git a/trunk/ipc/msgutil.c b/trunk/ipc/msgutil.c
index 8b5ce5d3f3ef..5652101cdac0 100644
--- a/trunk/ipc/msgutil.c
+++ b/trunk/ipc/msgutil.c
@@ -27,11 +27,6 @@ DEFINE_SPINLOCK(mq_lock);
  */
 struct ipc_namespace init_ipc_ns = {
 	.count		= ATOMIC_INIT(1),
-#ifdef CONFIG_POSIX_MQUEUE
-	.mq_queues_max   = DFLT_QUEUESMAX,
-	.mq_msg_max      = DFLT_MSGMAX,
-	.mq_msgsize_max  = DFLT_MSGSIZEMAX,
-#endif
 	.user_ns = &init_user_ns,
 };