From 30a0d75e27538b77c21669c950be8ebead735e94 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 25 Jul 2008 01:48:42 -0700 Subject: [PATCH] --- yaml --- r: 106017 b: refs/heads/master c: 84406c153a5bfa5d8b428a0933e9d39db6b59a75 h: refs/heads/master i: 106015: 2f155277dfbb40218dee1b2b445168285acefa86 v: v3 --- [refs] | 2 +- trunk/kernel/pid_namespace.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7d26d98bdbee..f790cb84fb6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 081e4c8a75692c21f3a119a81ca3270081879d0e +refs/heads/master: 84406c153a5bfa5d8b428a0933e9d39db6b59a75 diff --git a/trunk/kernel/pid_namespace.c b/trunk/kernel/pid_namespace.c index 98702b4b8851..06331cc1c3f5 100644 --- a/trunk/kernel/pid_namespace.c +++ b/trunk/kernel/pid_namespace.c @@ -71,7 +71,7 @@ static struct pid_namespace *create_pid_namespace(unsigned int level) struct pid_namespace *ns; int i; - ns = kmem_cache_alloc(pid_ns_cachep, GFP_KERNEL); + ns = kmem_cache_zalloc(pid_ns_cachep, GFP_KERNEL); if (ns == NULL) goto out; @@ -84,17 +84,13 @@ static struct pid_namespace *create_pid_namespace(unsigned int level) goto out_free_map; kref_init(&ns->kref); - ns->last_pid = 0; - ns->child_reaper = NULL; ns->level = level; set_bit(0, ns->pidmap[0].page); atomic_set(&ns->pidmap[0].nr_free, BITS_PER_PAGE - 1); - for (i = 1; i < PIDMAP_ENTRIES; i++) { - ns->pidmap[i].page = NULL; + for (i = 1; i < PIDMAP_ENTRIES; i++) atomic_set(&ns->pidmap[i].nr_free, BITS_PER_PAGE); - } return ns;