common object embedded into various struct ....ns

for now - just move corresponding ->proc_inum instances over there

Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 5 insertions, 5 deletions

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 7e7095974d54..5930471a2902 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -31,7 +31,7 @@ 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,
 };
 
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);
diff --git a/ipc/namespace.c b/ipc/namespace.c
index b54468e48e32..177fa9db391d 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -26,7 +26,7 @@ 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 = proc_alloc_inum(&ns->ns.inum);
         if (err) {
                 kfree(ns);
                 return ERR_PTR(err);
@@ -35,7 +35,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
         atomic_set(&ns->count, 1);
         err = mq_init_ns(ns);
         if (err) {
-                proc_free_inum(ns->proc_inum);
+                proc_free_inum(ns->ns.inum);
                 kfree(ns);
                 return ERR_PTR(err);
         }
@@ -119,7 +119,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);
+        proc_free_inum(ns->ns.inum);
         kfree(ns);
 }
 
@@ -186,7 +186,7 @@ static unsigned int ipcns_inum(void *vp)
 {
         struct ipc_namespace *ns = vp;
 
-        return ns->proc_inum;
+        return ns->ns.inum;
 }
 
 const struct proc_ns_operations ipcns_operations = {