diff options
-rw-r--r-- | include/linux/init_task.h | 1 | ||||
-rw-r--r-- | include/linux/nsproxy.h | 1 | ||||
-rw-r--r-- | kernel/nsproxy.c | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index b5315150199e..6383d2d83bb0 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -75,7 +75,6 @@ extern struct nsproxy init_nsproxy; | |||
75 | .pid_ns = &init_pid_ns, \ | 75 | .pid_ns = &init_pid_ns, \ |
76 | .count = ATOMIC_INIT(1), \ | 76 | .count = ATOMIC_INIT(1), \ |
77 | .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ | 77 | .nslock = __SPIN_LOCK_UNLOCKED(nsproxy.nslock), \ |
78 | .id = 0, \ | ||
79 | .uts_ns = &init_uts_ns, \ | 78 | .uts_ns = &init_uts_ns, \ |
80 | .mnt_ns = NULL, \ | 79 | .mnt_ns = NULL, \ |
81 | INIT_IPC_NS(ipc_ns) \ | 80 | INIT_IPC_NS(ipc_ns) \ |
diff --git a/include/linux/nsproxy.h b/include/linux/nsproxy.h index fdfb0e44912f..0b9f0dc30d61 100644 --- a/include/linux/nsproxy.h +++ b/include/linux/nsproxy.h | |||
@@ -24,7 +24,6 @@ struct pid_namespace; | |||
24 | struct nsproxy { | 24 | struct nsproxy { |
25 | atomic_t count; | 25 | atomic_t count; |
26 | spinlock_t nslock; | 26 | spinlock_t nslock; |
27 | unsigned long id; | ||
28 | struct uts_namespace *uts_ns; | 27 | struct uts_namespace *uts_ns; |
29 | struct ipc_namespace *ipc_ns; | 28 | struct ipc_namespace *ipc_ns; |
30 | struct mnt_namespace *mnt_ns; | 29 | struct mnt_namespace *mnt_ns; |
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index e2ce748e96af..f5b9ee6f6bbb 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c | |||
@@ -46,10 +46,8 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig) | |||
46 | struct nsproxy *ns; | 46 | struct nsproxy *ns; |
47 | 47 | ||
48 | ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL); | 48 | ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL); |
49 | if (ns) { | 49 | if (ns) |
50 | atomic_set(&ns->count, 1); | 50 | atomic_set(&ns->count, 1); |
51 | ns->id = -1; | ||
52 | } | ||
53 | return ns; | 51 | return ns; |
54 | } | 52 | } |
55 | 53 | ||