userns: add a user namespace owner of ipc ns

[deliverable/linux.git] / ipc / msgutil.c

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 73c316cb8613a4dd8ad0c1bd0709eec95bfb6bbc..8b5ce5d3f3ef3e4f468d5afc4175cd22518fc029 100644 (file)
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -18,23 +18,21 @@
 
 #include "util.h"
 
+DEFINE_SPINLOCK(mq_lock);
+
 /*
  * The next 2 defines are here bc this is the only file
  * compiled when either CONFIG_SYSVIPC and CONFIG_POSIX_MQUEUE
  * and not CONFIG_IPC_NS.
  */
 struct ipc_namespace init_ipc_ns = {
-       .kref = {
-               /* It's not for this patch to change, but should this be 1? */
-               .refcount       = ATOMIC_INIT(2),
-       },
+       .count          = ATOMIC_INIT(1),
 #ifdef CONFIG_POSIX_MQUEUE
-       .mq_mnt          = NULL,
-       .mq_queues_count = 0,
        .mq_queues_max   = DFLT_QUEUESMAX,
        .mq_msg_max      = DFLT_MSGMAX,
        .mq_msgsize_max  = DFLT_MSGSIZEMAX,
 #endif
+       .user_ns = &init_user_ns,
 };
 
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);