Commit 9fcc2d15 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds

proc: simplify and correct proc_flush_task

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: default avatarEric 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c0f2a9d7
......@@ -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];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment