Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=69cccb887a35f3761b7ea62cdd2bee602868c735
Commit: 69cccb887a35f3761b7ea62cdd2bee602868c735
Parent: 6651fd561bc6fbc688542e9a5bf070c6485eebe8
Author: Pavel Emelyanov <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 23:40:44 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Oct 19 11:53:43 2007 -0700
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 <[EMAIL PROTECTED]>
Cc: Ian Kent <[EMAIL PROTECTED]>
Cc: Paul Menage <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
fs/autofs/root.c | 2 +-
kernel/cgroup.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 592f640..5efff3c 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -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));
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index ca38db2..c2f12a4 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
