summaryrefslogtreecommitdiff
path: root/kernel/cpuset.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2006-06-26 00:25:56 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 09:58:26 -0700
commit13b41b09491e5d75e8027dca1ee78f5e073bc4c0 (patch)
tree3f08183a4f59075fc3015165183b8ef17cb562a6 /kernel/cpuset.c
parent99f895518368252ba862cc15ce4eb98ebbe1bec6 (diff)
downloadlwn-13b41b09491e5d75e8027dca1ee78f5e073bc4c0.tar.gz
lwn-13b41b09491e5d75e8027dca1ee78f5e073bc4c0.zip
[PATCH] proc: Use struct pid not struct task_ref
Incrementally update my proc-dont-lock-task_structs-indefinitely patches so that they work with struct pid instead of struct task_ref. Mostly this is a straight 1-1 substitution. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/cpuset.c')
-rw-r--r--kernel/cpuset.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 3e991c0c02e2..1535af3a912d 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -50,7 +50,6 @@
#include <linux/time.h>
#include <linux/backing-dev.h>
#include <linux/sort.h>
-#include <linux/task_ref.h>
#include <asm/uaccess.h>
#include <asm/atomic.h>
@@ -2443,7 +2442,7 @@ void __cpuset_memory_pressure_bump(void)
*/
static int proc_cpuset_show(struct seq_file *m, void *v)
{
- struct task_ref *tref;
+ struct pid *pid;
struct task_struct *tsk;
char *buf;
int retval;
@@ -2454,8 +2453,8 @@ static int proc_cpuset_show(struct seq_file *m, void *v)
goto out;
retval = -ESRCH;
- tref = m->private;
- tsk = get_tref_task(tref);
+ pid = m->private;
+ tsk = get_pid_task(pid, PIDTYPE_PID);
if (!tsk)
goto out_free;
@@ -2478,8 +2477,8 @@ out:
static int cpuset_open(struct inode *inode, struct file *file)
{
- struct task_ref *tref = PROC_I(inode)->tref;
- return single_open(file, proc_cpuset_show, tref);
+ struct pid *pid = PROC_I(inode)->pid;
+ return single_open(file, proc_cpuset_show, pid);
}
struct file_operations proc_cpuset_operations = {