diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-17 02:30:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:59 -0400 |
commit | 1efd24fa05976ea20582c18dd4b80d7311b9b94a (patch) | |
tree | 888f9cc97bca59248fc8bd3dbc578fa7d0c13149 | |
parent | 970a8645ca051225a32401e4c80b50fc0a49c081 (diff) |
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>
-rw-r--r-- | include/linux/init_task.h | 1 | ||||
-rw-r--r-- | include/linux/nsproxy.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 3a619f57a2b2..d4b2f1c76e12 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -76,7 +76,6 @@ extern struct nsproxy init_nsproxy; | |||
76 | #define INIT_NSPROXY(nsproxy) { \ | 76 | #define INIT_NSPROXY(nsproxy) { \ |
77 | .pid_ns = &init_pid_ns, \ | 77 | .pid_ns = &init_pid_ns, \ |
78 | .count = ATOMIC_INIT(1), \ | 78 | .count = ATOMIC_INIT(1), \ |
79 | .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ | ||
80 | .uts_ns = &init_uts_ns, \ | 79 | .uts_ns = &init_uts_ns, \ |
81 | .mnt_ns = NULL, \ | 80 | .mnt_ns = NULL, \ |
82 | INIT_NET_NS(net_ns) \ | 81 | INIT_NET_NS(net_ns) \ |
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h index bec4485e3d76..033a648709b6 100644 --- a/include/linux/nsproxy.h +++ b/include/linux/nsproxy.h | |||
@@ -23,7 +23,6 @@ struct pid_namespace; | |||
23 | */ | 23 | */ |
24 | struct nsproxy { | 24 | struct nsproxy { |
25 | atomic_t count; | 25 | atomic_t count; |
26 | spinlock_t nslock; | ||
27 | struct uts_namespace *uts_ns; | 26 | struct uts_namespace *uts_ns; |
28 | struct ipc_namespace *ipc_ns; | 27 | struct ipc_namespace *ipc_ns; |
29 | struct mnt_namespace *mnt_ns; | 28 | struct mnt_namespace *mnt_ns; |