Use task_pid_nr() instead of pid_nr(task_pid())
There are two places that do so - the cgroups subsystem and the autofs code. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Cc: Ian Kent <raven@themaw.net> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6651fd561b
commit
69cccb887a
2 changed files with 2 additions and 2 deletions
|
@ -214,7 +214,7 @@ static struct dentry *autofs_root_lookup(struct inode *dir, struct dentry *dentr
|
|||
|
||||
oz_mode = autofs_oz_mode(sbi);
|
||||
DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, "
|
||||
"oz_mode = %d\n", pid_nr(task_pid(current)),
|
||||
"oz_mode = %d\n", task_pid_nr(current),
|
||||
task_pgrp_nr(current), sbi->catatonic,
|
||||
oz_mode));
|
||||
|
||||
|
|
|
@ -1763,7 +1763,7 @@ static int pid_array_load(pid_t *pidarray, int npids, struct cgroup *cont)
|
|||
while ((tsk = cgroup_iter_next(cont, &it))) {
|
||||
if (unlikely(n == npids))
|
||||
break;
|
||||
pidarray[n++] = pid_nr(task_pid(tsk));
|
||||
pidarray[n++] = task_pid_nr(tsk);
|
||||
}
|
||||
cgroup_iter_end(cont, &it);
|
||||
return n;
|
||||
|
|
Loading…
Reference in a new issue