Merge branch 'nsfs' into for-next

2 files changed, 19 insertions, 18 deletions

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 7e7095974d54..2b491590ebab 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -31,7 +31,10 @@ DEFINE_SPINLOCK(mq_lock);
 struct ipc_namespace init_ipc_ns = {
         .count          = ATOMIC_INIT(1),
         .user_ns = &init_user_ns,
-        .proc_inum = PROC_IPC_INIT_INO,
+        .ns.inum = PROC_IPC_INIT_INO,
+#ifdef CONFIG_IPC_NS
+        .ns.ops = &ipcns_operations,
+#endif
 };
 
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);
diff --git a/ipc/namespace.c b/ipc/namespace.c
index b54468e48e32..382e2aa42d8a 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -26,16 +26,17 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
         if (ns == NULL)
                 return ERR_PTR(-ENOMEM);
 
-        err = proc_alloc_inum(&ns->proc_inum);
+        err = ns_alloc_inum(&ns->ns);
         if (err) {
                 kfree(ns);
                 return ERR_PTR(err);
         }
+        ns->ns.ops = &ipcns_operations;
 
         atomic_set(&ns->count, 1);
         err = mq_init_ns(ns);
         if (err) {
-                proc_free_inum(ns->proc_inum);
+                ns_free_inum(&ns->ns);
                 kfree(ns);
                 return ERR_PTR(err);
         }
@@ -119,7 +120,7 @@ static void free_ipc_ns(struct ipc_namespace *ns)
          */
         ipcns_notify(IPCNS_REMOVED);
         put_user_ns(ns->user_ns);
-        proc_free_inum(ns->proc_inum);
+        ns_free_inum(&ns->ns);
         kfree(ns);
 }
 
@@ -149,7 +150,12 @@ void put_ipc_ns(struct ipc_namespace *ns)
         }
 }
 
-static void *ipcns_get(struct task_struct *task)
+static inline struct ipc_namespace *to_ipc_ns(struct ns_common *ns)
+{
+        return container_of(ns, struct ipc_namespace, ns);
+}
+
+static struct ns_common *ipcns_get(struct task_struct *task)
 {
         struct ipc_namespace *ns = NULL;
         struct nsproxy *nsproxy;
@@ -160,17 +166,17 @@ static void *ipcns_get(struct task_struct *task)
                 ns = get_ipc_ns(nsproxy->ipc_ns);
         task_unlock(task);
 
-        return ns;
+        return ns ? &ns->ns : NULL;
 }
 
-static void ipcns_put(void *ns)
+static void ipcns_put(struct ns_common *ns)
 {
-        return put_ipc_ns(ns);
+        return put_ipc_ns(to_ipc_ns(ns));
 }
 
-static int ipcns_install(struct nsproxy *nsproxy, void *new)
+static int ipcns_install(struct nsproxy *nsproxy, struct ns_common *new)
 {
-        struct ipc_namespace *ns = new;
+        struct ipc_namespace *ns = to_ipc_ns(new);
         if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN) ||
             !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
                 return -EPERM;
@@ -182,18 +188,10 @@ static int ipcns_install(struct nsproxy *nsproxy, void *new)
         return 0;
 }
 
-static unsigned int ipcns_inum(void *vp)
-{
-        struct ipc_namespace *ns = vp;
-
-        return ns->proc_inum;
-}
-
 const struct proc_ns_operations ipcns_operations = {
         .name           = "ipc",
         .type           = CLONE_NEWIPC,
         .get            = ipcns_get,
         .put            = ipcns_put,
         .install        = ipcns_install,
-        .inum           = ipcns_inum,
 };