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>

diff --git a/fs/mount.h b/fs/mount.h
index f82c62840905f8be7df888a6dd87bfb2e2c30af5..0ad6f760ce521b93a2847c501e579d1c4a440334 100644 (file)
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -1,10 +1,11 @@
 #include <linux/mount.h>
 #include <linux/seq_file.h>
 #include <linux/poll.h>
+#include <linux/ns_common.h>
 
 struct mnt_namespace {
        atomic_t                count;
-       unsigned int            proc_inum;
+       struct ns_common        ns;
        struct mount *  root;
        struct list_head        list;
        struct user_namespace   *user_ns;

diff --git a/fs/namespace.c b/fs/namespace.c
index 5b66b2b3624d0da0efe405a6ecb4c86e07a0b58f..adc2ea2532a04fc0ffb686f125dbdccffdbee6b8 100644 (file)
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -2640,7 +2640,7 @@ dput_out:
 
 static void free_mnt_ns(struct mnt_namespace *ns)
 {
-       proc_free_inum(ns->proc_inum);
+       proc_free_inum(ns->ns.inum);
        put_user_ns(ns->user_ns);
        kfree(ns);
 }
@@ -2662,7 +2662,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
        new_ns = kmalloc(sizeof(struct mnt_namespace), GFP_KERNEL);
        if (!new_ns)
                return ERR_PTR(-ENOMEM);
-       ret = proc_alloc_inum(&new_ns->proc_inum);
+       ret = proc_alloc_inum(&new_ns->ns.inum);
        if (ret) {
                kfree(new_ns);
                return ERR_PTR(ret);
@@ -3201,7 +3201,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
 static unsigned int mntns_inum(void *ns)
 {
        struct mnt_namespace *mnt_ns = ns;
-       return mnt_ns->proc_inum;
+       return mnt_ns->ns.inum;
 }
 
 const struct proc_ns_operations mntns_operations = {

diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index 35e7eca4e33b1fbbde3029b5f3cb2be350d0dafc..52a64012815141299487958b5aba8be12eb3c505 100644 (file)
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -6,6 +6,7 @@
 #include <linux/rwsem.h>
 #include <linux/notifier.h>
 #include <linux/nsproxy.h>
+#include <linux/ns_common.h>
 
 /*
  * ipc namespace events
@@ -68,7 +69,7 @@ struct ipc_namespace {
        /* user_ns which owns the ipc ns */
        struct user_namespace *user_ns;
 
-       unsigned int    proc_inum;
+       struct ns_common ns;
 };
 
 extern struct ipc_namespace init_ipc_ns;

diff --git a/include/linux/ns_common.h b/include/linux/ns_common.h
new file mode 100644 (file)
index 0000000..e7db1cd
--- /dev/null
+++ b/include/linux/ns_common.h
@@ -0,0 +1,8 @@
+#ifndef _LINUX_NS_COMMON_H
+#define _LINUX_NS_COMMON_H
+
+struct ns_common {
+       unsigned int inum;
+};
+
+#endif

diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index 1997ffc295a7e5a38020e3bb0f0882eef1e5ad76..b9cf6c51b18106ebe2d6d715d6a1804e76ef900b 100644 (file)
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -8,6 +8,7 @@
 #include <linux/threads.h>
 #include <linux/nsproxy.h>
 #include <linux/kref.h>
+#include <linux/ns_common.h>
 
 struct pidmap {
        atomic_t nr_free;
@@ -43,7 +44,7 @@ struct pid_namespace {
        kgid_t pid_gid;
        int hide_pid;
        int reboot;     /* group exit code if this pidns was rebooted */
-       unsigned int proc_inum;
+       struct ns_common ns;
 };
 
 extern struct pid_namespace init_pid_ns;

diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
index e95372654f091a822388054a1e89d6f008d6712c..4cf06c140e21bfb36c6a20c14f61cd3036f3d9e9 100644 (file)
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@ -3,6 +3,7 @@
 
 #include <linux/kref.h>
 #include <linux/nsproxy.h>
+#include <linux/ns_common.h>
 #include <linux/sched.h>
 #include <linux/err.h>
 
@@ -26,7 +27,7 @@ struct user_namespace {
        int                     level;
        kuid_t                  owner;
        kgid_t                  group;
-       unsigned int            proc_inum;
+       struct ns_common        ns;
 
        /* Register of per-UID persistent keyrings for this namespace */
 #ifdef CONFIG_PERSISTENT_KEYRINGS

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 239e27733d6ccd42482c0cda35e28ec052ef730e..5093f58ae192c379b13b9e5e74605a0e6c571d25 100644 (file)
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -5,6 +5,7 @@
 #include <linux/sched.h>
 #include <linux/kref.h>
 #include <linux/nsproxy.h>
+#include <linux/ns_common.h>
 #include <linux/err.h>
 #include <uapi/linux/utsname.h>
 
@@ -23,7 +24,7 @@ struct uts_namespace {
        struct kref kref;
        struct new_utsname name;
        struct user_namespace *user_ns;
-       unsigned int proc_inum;
+       struct ns_common ns;
 };
 extern struct uts_namespace init_uts_ns;
 

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index e0d64667a4b3e3be0cb9f70d45f02988fc19b21f..2e8756b8c77543391b1c3381fa442c2a2a1c582e 100644 (file)
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -26,6 +26,7 @@
 #endif
 #include <net/netns/nftables.h>
 #include <net/netns/xfrm.h>
+#include <linux/ns_common.h>
 
 struct user_namespace;
 struct proc_dir_entry;
@@ -60,7 +61,7 @@ struct net {
 
        struct user_namespace   *user_ns;       /* Owning user namespace */
 
-       unsigned int            proc_inum;
+       struct ns_common        ns;
 
        struct proc_dir_entry   *proc_net;
        struct proc_dir_entry   *proc_net_stat;

diff --git a/init/version.c b/init/version.c
index 1a4718e500fe78238de84cc872eb559706dfbb5e..e23dbdabb26bfd89ddc32781195cc209221ebb1c 100644 (file)
--- a/init/version.c
+++ b/init/version.c
@@ -35,7 +35,7 @@ struct uts_namespace init_uts_ns = {
                .domainname     = UTS_DOMAINNAME,
        },
        .user_ns = &init_user_ns,
-       .proc_inum = PROC_UTS_INIT_INO,
+       .ns.inum = PROC_UTS_INIT_INO,
 };
 EXPORT_SYMBOL_GPL(init_uts_ns);
 

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 7e7095974d54a10e175dd06504cb8dc6ac73adcb..5930471a29022e8ed1b9e47d4bcc8b8f78e08379 100644 (file)
--- 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 b54468e48e3214899b992b38b130072d1a580d4b..177fa9db391d25f7dab7cfb203f15137e272c794 100644 (file)
--- 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 = {

diff --git a/kernel/pid.c b/kernel/pid.c
index 9b9a26698144e126486e162955e49561514b1ce8..3650698cf1dc9b797593c30d984fa89cd3b4b0be 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -79,7 +79,7 @@ struct pid_namespace init_pid_ns = {
        .level = 0,
        .child_reaper = &init_task,
        .user_ns = &init_user_ns,
-       .proc_inum = PROC_PID_INIT_INO,
+       .ns.inum = PROC_PID_INIT_INO,
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);
 

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index db95d8eb761b4f92c4722a2667fb258e7e2b64c8..99e27e5bf906205b01888f38942d23ee442f92b5 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -105,7 +105,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
        if (ns->pid_cachep == NULL)
                goto out_free_map;
 
-       err = proc_alloc_inum(&ns->proc_inum);
+       err = proc_alloc_inum(&ns->ns.inum);
        if (err)
                goto out_free_map;
 
@@ -142,7 +142,7 @@ static void destroy_pid_namespace(struct pid_namespace *ns)
 {
        int i;
 
-       proc_free_inum(ns->proc_inum);
+       proc_free_inum(ns->ns.inum);
        for (i = 0; i < PIDMAP_ENTRIES; i++)
                kfree(ns->pidmap[i].page);
        put_user_ns(ns->user_ns);
@@ -365,7 +365,7 @@ static int pidns_install(struct nsproxy *nsproxy, void *ns)
 static unsigned int pidns_inum(void *ns)
 {
        struct pid_namespace *pid_ns = ns;
-       return pid_ns->proc_inum;
+       return pid_ns->ns.inum;
 }
 
 const struct proc_ns_operations pidns_operations = {

diff --git a/kernel/user.c b/kernel/user.c
index 4efa39350e4401213d15a06987e7603460121ef7..a7ca84bad8e6c544b77537fe5a295fc81ef9381d 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -50,7 +50,7 @@ struct user_namespace init_user_ns = {
        .count = ATOMIC_INIT(3),
        .owner = GLOBAL_ROOT_UID,
        .group = GLOBAL_ROOT_GID,
-       .proc_inum = PROC_USER_INIT_INO,
+       .ns.inum = PROC_USER_INIT_INO,
 #ifdef CONFIG_PERSISTENT_KEYRINGS
        .persistent_keyring_register_sem =
        __RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index aa312b0dc3ec254a55bf77c37116170b301988e5..fde5840826739fa9ebc764c6b1f012f137b549be 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -86,7 +86,7 @@ int create_user_ns(struct cred *new)
        if (!ns)
                return -ENOMEM;
 
-       ret = proc_alloc_inum(&ns->proc_inum);
+       ret = proc_alloc_inum(&ns->ns.inum);
        if (ret) {
                kmem_cache_free(user_ns_cachep, ns);
                return ret;
@@ -136,7 +136,7 @@ void free_user_ns(struct user_namespace *ns)
 #ifdef CONFIG_PERSISTENT_KEYRINGS
                key_put(ns->persistent_keyring_register);
 #endif
-               proc_free_inum(ns->proc_inum);
+               proc_free_inum(ns->ns.inum);
                kmem_cache_free(user_ns_cachep, ns);
                ns = parent;
        } while (atomic_dec_and_test(&parent->count));
@@ -891,7 +891,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
 static unsigned int userns_inum(void *ns)
 {
        struct user_namespace *user_ns = ns;
-       return user_ns->proc_inum;
+       return user_ns->ns.inum;
 }
 
 const struct proc_ns_operations userns_operations = {

diff --git a/kernel/utsname.c b/kernel/utsname.c
index 883aaaa7de8a90f28f13099b3fa77b222c20bd9c..b1cd00b828f2c7d3363b0a9748aa791bc1beceee 100644 (file)
--- a/kernel/utsname.c
+++ b/kernel/utsname.c
@@ -42,7 +42,7 @@ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns,
        if (!ns)
                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);
@@ -84,7 +84,7 @@ void free_uts_ns(struct kref *kref)
 
        ns = container_of(kref, struct uts_namespace, kref);
        put_user_ns(ns->user_ns);
-       proc_free_inum(ns->proc_inum);
+       proc_free_inum(ns->ns.inum);
        kfree(ns);
 }
 
@@ -127,7 +127,7 @@ static unsigned int utsns_inum(void *vp)
 {
        struct uts_namespace *ns = vp;
 
-       return ns->proc_inum;
+       return ns->ns.inum;
 }
 
 const struct proc_ns_operations utsns_operations = {

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 7f155175bba83a0c8083008ece1a56e265174984..f2f756ce99d7081c2c85065457a3687ebbbce8e7 100644 (file)
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -386,12 +386,12 @@ EXPORT_SYMBOL_GPL(get_net_ns_by_pid);
 
 static __net_init int net_ns_net_init(struct net *net)
 {
-       return proc_alloc_inum(&net->proc_inum);
+       return proc_alloc_inum(&net->ns.inum);
 }
 
 static __net_exit void net_ns_net_exit(struct net *net)
 {
-       proc_free_inum(net->proc_inum);
+       proc_free_inum(net->ns.inum);
 }
 
 static struct pernet_operations __net_initdata net_ns_ops = {
@@ -664,7 +664,7 @@ static int netns_install(struct nsproxy *nsproxy, void *ns)
 static unsigned int netns_inum(void *ns)
 {
        struct net *net = ns;
-       return net->proc_inum;
+       return net->ns.inum;
 }
 
 const struct proc_ns_operations netns_operations = {