From 9ed119eed5ea429847413de7b96998cb92fbc3e6 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 13 Dec 2006 00:34:04 -0800
Subject: [PATCH] --- yaml --- r: 44438 b: refs/heads/master c:
 5f8442edfb214908e9c6ca1142bf882c9bc364e5 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/init_task.h | 1 -
 trunk/include/linux/nsproxy.h   | 1 -
 trunk/kernel/nsproxy.c          | 4 +---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 091686681d0e..8465826caaae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c3cca941b64a938eaa9734585a93547c6be323
+refs/heads/master: 5f8442edfb214908e9c6ca1142bf882c9bc364e5
diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h
index b5315150199e..6383d2d83bb0 100644
--- a/trunk/include/linux/init_task.h
+++ b/trunk/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/trunk/include/linux/nsproxy.h b/trunk/include/linux/nsproxy.h
index fdfb0e44912f..0b9f0dc30d61 100644
--- a/trunk/include/linux/nsproxy.h
+++ b/trunk/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/trunk/kernel/nsproxy.c b/trunk/kernel/nsproxy.c
index e2ce748e96af..f5b9ee6f6bbb 100644
--- a/trunk/kernel/nsproxy.c
+++ b/trunk/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;
 }