summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-18 23:40:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 11:53:43 -0700
commit69cccb887a35f3761b7ea62cdd2bee602868c735 (patch)
tree37197177f0d2a8c7b147a33acdca59e5bf8f96b6 /kernel/cgroup.c
parent6651fd561bc6fbc688542e9a5bf070c6485eebe8 (diff)
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>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ca38db223f8..c2f12a49dff 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -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;