Skip to content

Commit

Permalink
[PATCH] don't use REMOVE_LINKS/SET_LINKS for reparenting
Browse files Browse the repository at this point in the history
There are places where kernel uses REMOVE_LINKS/SET_LINKS while changing
process's ->parent.  Use add_parent/remove_parent instead, they don't abuse
of global process list.

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>
  • Loading branch information
Oleg Nesterov authored and Linus Torvalds committed Mar 29, 2006
1 parent 8fafabd commit 9b678ec
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ static void reparent_to_init(void)

ptrace_unlink(current);
/* Reparent to init */
REMOVE_LINKS(current);
remove_parent(current);
current->parent = child_reaper;
current->real_parent = child_reaper;
SET_LINKS(current);
add_parent(current);

/* Set the exit signal to SIGCHLD so we signal init on exit */
current->exit_signal = SIGCHLD;
Expand Down
8 changes: 4 additions & 4 deletions kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ void __ptrace_link(task_t *child, task_t *new_parent)
if (child->parent == new_parent)
return;
list_add(&child->ptrace_list, &child->parent->ptrace_children);
REMOVE_LINKS(child);
remove_parent(child);
child->parent = new_parent;
SET_LINKS(child);
add_parent(child);
}

/*
Expand Down Expand Up @@ -77,9 +77,9 @@ void __ptrace_unlink(task_t *child)
child->ptrace = 0;
if (!list_empty(&child->ptrace_list)) {
list_del_init(&child->ptrace_list);
REMOVE_LINKS(child);
remove_parent(child);
child->parent = child->real_parent;
SET_LINKS(child);
add_parent(child);
}

ptrace_untrace(child);
Expand Down

0 comments on commit 9b678ec

Please sign in to comment.