Skip to content

Commit

Permalink
proc: simplify and correct proc_flush_task
Browse files Browse the repository at this point in the history
Currently we special case when we have only the initial pid namespace.
Unfortunately in doing so the copied case for the other namespaces was
broken so we don't properly flush the thread directories :(

So this patch removes the unnecessary special case (removing a usage of
proc_mnt) and corrects the flushing of the thread directories.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Al Viro <viro@ftp.linux.org.uk>
Cc: Pavel Emelyanov <xemul@openvz.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Eric W. Biederman authored and Linus Torvalds committed Nov 15, 2007
1 parent c0f2a9d commit 9fcc2d1
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -2328,21 +2328,18 @@ static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid)

void proc_flush_task(struct task_struct *task)
{
int i, leader;
struct pid *pid, *tgid;
int i;
struct pid *pid, *tgid = NULL;
struct upid *upid;

leader = thread_group_leader(task);
proc_flush_task_mnt(proc_mnt, task->pid, leader ? task->tgid : 0);
pid = task_pid(task);
if (pid->level == 0)
return;
if (thread_group_leader(task))
tgid = task_tgid(task);

tgid = task_tgid(task);
for (i = 1; i <= pid->level; i++) {
for (i = 0; i <= pid->level; i++) {
upid = &pid->numbers[i];
proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr,
leader ? 0 : tgid->numbers[i].nr);
tgid ? tgid->numbers[i].nr : 0);
}

upid = &pid->numbers[pid->level];
Expand Down

0 comments on commit 9fcc2d1

Please sign in to comment.