[PATCH] Revert "[PATCH] identifier to nsproxy" (5f8442ed) · Commits · 戴 / test

This reverts commit . 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>

include/linux/init_task.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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) \

include/linux/nsproxy.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

kernel/nsproxy.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message