[PATCH] Revert "[PATCH] identifier to nsproxy"

This reverts commit 373beb35cd6b625e0ba4ad98baace12310a26aa8.

No one is using this identifier yet.  The purpose of this identifier is to
export nsproxy to user space which is wrong.  nsproxy is an internal
implementation optimization, which should keep our fork times from getting
slower as we increase the number of global namespaces you don't have to
share.

Adding a global identifier like this is inappropriate because it makes
namespaces inherently non-recursive, greatly limiting what we can do with
them in the future.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index b5315150199e9528bbfa1b5fcfe64b669b199058..6383d2d83bb0c5b12e233c5fbfe53e6e47c49578 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy;
        .pid_ns         = &init_pid_ns,                                 \
        .count          = ATOMIC_INIT(1),                               \
        .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
-       .id             = 0,                                            \
        .uts_ns         = &init_uts_ns,                                 \
        .mnt_ns         = NULL,                                         \
        INIT_IPC_NS(ipc_ns)                                             \

diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index fdfb0e44912f1ce68794e52f6ca5cf5756f45ae7..0b9f0dc30d6114a1f5177a7fde829d2199137172 100644 (file)
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -24,7 +24,6 @@ struct pid_namespace;
 struct nsproxy {
        atomic_t count;
        spinlock_t nslock;
-       unsigned long id;
        struct uts_namespace *uts_ns;
        struct ipc_namespace *ipc_ns;
        struct mnt_namespace *mnt_ns;

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index e2ce748e96afaca08cf0e5b2821d4cf6e8cab823..f5b9ee6f6bbb02733cef1e64fabe4dc521efc767 100644 (file)
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
        struct nsproxy *ns;
 
        ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
-       if (ns) {
+       if (ns)
                atomic_set(&ns->count, 1);
-               ns->id = -1;
-       }
        return ns;
 }