korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] use current->nsproxy->pid_ns

Browse Source 
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Cedric Le Goater 2006-12-08 02:38:00 -08:00 committed by Linus Torvalds
parent 9a575a92db
commit 6cc1b22a4a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/proc_misc.c
View File

@ -92,7 +92,7 @@ static int loadavg_read_proc(char *page, char **start, off_t off,
LOAD_INT(a), LOAD_FRAC(a), LOAD_INT(a), LOAD_FRAC(a),
LOAD_INT(b), LOAD_FRAC(b), LOAD_INT(b), LOAD_FRAC(b),
LOAD_INT(c), LOAD_FRAC(c), 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); return proc_calc_metrics(page, start, off, count, eof, len);
} }

6
kernel/pid.c
View File

@ -196,7 +196,7 @@ fastcall void free_pid(struct pid *pid)
hlist_del_rcu(&pid->pid_chain); hlist_del_rcu(&pid->pid_chain);
spin_unlock_irqrestore(&pidmap_lock, flags); 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); call_rcu(&pid->rcu, delayed_put_pid);
} }
@ -210,7 +210,7 @@ struct pid *alloc_pid(void)
if (!pid) if (!pid)
goto out; goto out;
nr = alloc_pidmap(&init_pid_ns); nr = alloc_pidmap(current->nsproxy->pid_ns);
if (nr < 0) if (nr < 0)
goto out_free; goto out_free;
@ -352,7 +352,7 @@ struct pid *find_ge_pid(int nr)
pid = find_pid(nr); pid = find_pid(nr);
if (pid) if (pid)
break; break;
nr = next_pidmap(&init_pid_ns, nr); nr = next_pidmap(current->nsproxy->pid_ns, nr);
} while (nr > 0); } while (nr > 0);
return pid; return pid;