From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 17 Oct 2007 06:30:10 +0000 (-0700)
Subject: Remove unused member from nsproxy
X-Git-Tag: v2.6.24-rc1~608
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1efd24fa05976ea20582c18dd4b80d7311b9b94a;p=users%2Fjedix%2Flinux-maple.git
Remove unused member from nsproxy
The nslock spinlock is not used in the kernel at all. Remove it.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 3a619f57a2b2a..d4b2f1c76e12c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -76,7 +76,6 @@ extern struct nsproxy init_nsproxy;
#define INIT_NSPROXY(nsproxy) { \
.pid_ns = &init_pid_ns, \
.count = ATOMIC_INIT(1), \
- .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \
.uts_ns = &init_uts_ns, \
.mnt_ns = NULL, \
INIT_NET_NS(net_ns) \
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h
index bec4485e3d76d..033a648709b62 100644
--- a/include/linux/nsproxy.h
+++ b/include/linux/nsproxy.h
@@ -23,7 +23,6 @@ struct pid_namespace;
*/
struct nsproxy {
atomic_t count;
- spinlock_t nslock;
struct uts_namespace *uts_ns;
struct ipc_namespace *ipc_ns;
struct mnt_namespace *mnt_ns;