From 78ea9296c87d54a0918900ed3bbab620b8748f77 Mon Sep 17 00:00:00 2001 From: Cedric Le Goater Date: Fri, 8 Dec 2006 02:38:00 -0800 Subject: [PATCH] --- yaml --- r: 43637 b: refs/heads/master c: 6cc1b22a4acef3816eaa5f8c227d93d749b23195 h: refs/heads/master i: 43635: 6640a6c197da3d9f37f3cf418fa1f5cbdc1b4a57 v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_misc.c | 2 +- trunk/kernel/pid.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 86691c235acd..d3e01b22d5ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a575a92db3312a40cdf0b0406d88de88ad9741e +refs/heads/master: 6cc1b22a4acef3816eaa5f8c227d93d749b23195 diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 89ccfa16b000..f6d6f81dd446 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -92,7 +92,7 @@ static int loadavg_read_proc(char *page, char **start, off_t off, LOAD_INT(a), LOAD_FRAC(a), LOAD_INT(b), LOAD_FRAC(b), LOAD_INT(c), LOAD_FRAC(c), - nr_running(), nr_threads, init_pid_ns.last_pid); + nr_running(), nr_threads, current->nsproxy->pid_ns->last_pid); return proc_calc_metrics(page, start, off, count, eof, len); } diff --git a/trunk/kernel/pid.c b/trunk/kernel/pid.c index 5319b9f2fc5e..1d9cc268b499 100644 --- a/trunk/kernel/pid.c +++ b/trunk/kernel/pid.c @@ -196,7 +196,7 @@ fastcall void free_pid(struct pid *pid) hlist_del_rcu(&pid->pid_chain); spin_unlock_irqrestore(&pidmap_lock, flags); - free_pidmap(&init_pid_ns, pid->nr); + free_pidmap(current->nsproxy->pid_ns, pid->nr); call_rcu(&pid->rcu, delayed_put_pid); } @@ -210,7 +210,7 @@ struct pid *alloc_pid(void) if (!pid) goto out; - nr = alloc_pidmap(&init_pid_ns); + nr = alloc_pidmap(current->nsproxy->pid_ns); if (nr < 0) goto out_free; @@ -352,7 +352,7 @@ struct pid *find_ge_pid(int nr) pid = find_pid(nr); if (pid) break; - nr = next_pidmap(&init_pid_ns, nr); + nr = next_pidmap(current->nsproxy->pid_ns, nr); } while (nr > 0); return pid;