aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-10-02 05:18:54 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:24 -0400
commitb0fa9db6abdb2875a6d3069ddc6a2846a73fa5cd (patch)
tree840fd70ce726f94ff389d97dd012e53ae02f1dcf /fs
parenta593d6edeb0a5a2c6e6919b225cec668a375df52 (diff)
[PATCH] proc: drop tasklist lock in task_state()
task_state() needs tasklist_lock to protect ->parent/->real_parent. However task->parent points to nowhere only when the actions below happen in order 1) release_task(task) 2) release_task(task->parent) 3) a grace period passed But 3) implies that the memory ops from 1) should be finished, so pid_alive() can't be true in such a case. Otherwise, we don't care if ->parent/->real_parent changes under us. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: "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 'fs')
-rw-r--r--fs/proc/array.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 35bd39dac247..25e917fb4739 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -162,7 +162,7 @@ static inline char * task_state(struct task_struct *p, char *buffer)
162 int g; 162 int g;
163 struct fdtable *fdt = NULL; 163 struct fdtable *fdt = NULL;
164 164
165 read_lock(&tasklist_lock); 165 rcu_read_lock();
166 buffer += sprintf(buffer, 166 buffer += sprintf(buffer,
167 "State:\t%s\n" 167 "State:\t%s\n"
168 "SleepAVG:\t%lu%%\n" 168 "SleepAVG:\t%lu%%\n"
@@ -174,14 +174,13 @@ static inline char * task_state(struct task_struct *p, char *buffer)
174 "Gid:\t%d\t%d\t%d\t%d\n", 174 "Gid:\t%d\t%d\t%d\t%d\n",
175 get_task_state(p), 175 get_task_state(p),
176 (p->sleep_avg/1024)*100/(1020000000/1024), 176 (p->sleep_avg/1024)*100/(1020000000/1024),
177 p->tgid, 177 p->tgid, p->pid,
178 p->pid, pid_alive(p) ? p->group_leader->real_parent->tgid : 0, 178 pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0,
179 pid_alive(p) && p->ptrace ? p->parent->pid : 0, 179 pid_alive(p) && p->ptrace ? rcu_dereference(p->parent)->pid : 0,
180 p->uid, p->euid, p->suid, p->fsuid, 180 p->uid, p->euid, p->suid, p->fsuid,
181 p->gid, p->egid, p->sgid, p->fsgid); 181 p->gid, p->egid, p->sgid, p->fsgid);
182 read_unlock(&tasklist_lock); 182
183 task_lock(p); 183 task_lock(p);
184 rcu_read_lock();
185 if (p->files) 184 if (p->files)
186 fdt = files_fdtable(p->files); 185 fdt = files_fdtable(p->files);
187 buffer += sprintf(buffer, 186 buffer += sprintf(buffer,