Commit 5f8442ed authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

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

This reverts commit 373beb35.

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: default avatarEric W. Biederman <ebiederm@xmission.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d4c3cca9
...@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy; ...@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy;
.pid_ns = &init_pid_ns, \ .pid_ns = &init_pid_ns, \
.count = ATOMIC_INIT(1), \ .count = ATOMIC_INIT(1), \
.nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \
.id = 0, \
.uts_ns = &init_uts_ns, \ .uts_ns = &init_uts_ns, \
.mnt_ns = NULL, \ .mnt_ns = NULL, \
INIT_IPC_NS(ipc_ns) \ INIT_IPC_NS(ipc_ns) \
......
...@@ -24,7 +24,6 @@ struct pid_namespace; ...@@ -24,7 +24,6 @@ struct pid_namespace;
struct nsproxy { struct nsproxy {
atomic_t count; atomic_t count;
spinlock_t nslock; spinlock_t nslock;
unsigned long id;
struct uts_namespace *uts_ns; struct uts_namespace *uts_ns;
struct ipc_namespace *ipc_ns; struct ipc_namespace *ipc_ns;
struct mnt_namespace *mnt_ns; struct mnt_namespace *mnt_ns;
......
...@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig) ...@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
struct nsproxy *ns; struct nsproxy *ns;
ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL); ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
if (ns) { if (ns)
atomic_set(&ns->count, 1); atomic_set(&ns->count, 1);
ns->id = -1;
}
return ns; return ns;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment