From d627ae1ffb099f185fef61eac27b643310c872b3 Mon Sep 17 00:00:00 2001 From: Cedric Le Goater Date: Fri, 8 Dec 2006 02:37:57 -0800 Subject: [PATCH] --- yaml --- r: 43634 b: refs/heads/master c: 373beb35cd6b625e0ba4ad98baace12310a26aa8 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, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 652701af8342..8e33fbd01bda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b3286ed1169d74fea401367d6d4d6c6ec758a81 +refs/heads/master: 373beb35cd6b625e0ba4ad98baace12310a26aa8 diff --git a/trunk/include/linux/init_task.h b/trunk/include/linux/init_task.h index 5c4989172f7e..90c5f9a07730 100644 --- a/trunk/include/linux/init_task.h +++ b/trunk/include/linux/init_task.h @@ -75,6 +75,7 @@ extern struct nsproxy init_nsproxy; #define INIT_NSPROXY(nsproxy) { \ .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 0aba1b1a39c7..27f37c1ec1d9 100644 --- a/trunk/include/linux/nsproxy.h +++ b/trunk/include/linux/nsproxy.h @@ -23,6 +23,7 @@ struct ipc_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 bd9cb435dfe0..f223c15c18e9 100644 --- a/trunk/kernel/nsproxy.c +++ b/trunk/kernel/nsproxy.c @@ -45,8 +45,10 @@ 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; }