diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-04-30 03:53:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:38 -0400 |
commit | 53b6f9fbd3b63af14b4f6268e8b5b80d178d05bc (patch) | |
tree | 93a5bd26974e07a3d7fa20dc17c8b70daacc1d85 /kernel/exit.c | |
parent | 2800d8d19e51414403df8144eaa214bb03400b87 (diff) |
ptrace: introduce ptrace_reparented() helper
Add another trivial helper for the sake of grep. It also auto-documents the
fact that ->parent != real_parent implies ->ptrace.
No functional changes.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 879ed6e1c883..0da2921b1e7f 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -698,7 +698,7 @@ reparent_thread(struct task_struct *p, struct task_struct *father, int traced) | |||
698 | if (unlikely(traced)) { | 698 | if (unlikely(traced)) { |
699 | /* Preserve ptrace links if someone else is tracing this child. */ | 699 | /* Preserve ptrace links if someone else is tracing this child. */ |
700 | list_del_init(&p->ptrace_list); | 700 | list_del_init(&p->ptrace_list); |
701 | if (p->parent != p->real_parent) | 701 | if (ptrace_reparented(p)) |
702 | list_add(&p->ptrace_list, &p->real_parent->ptrace_children); | 702 | list_add(&p->ptrace_list, &p->real_parent->ptrace_children); |
703 | } else { | 703 | } else { |
704 | /* If this child is being traced, then we're the one tracing it | 704 | /* If this child is being traced, then we're the one tracing it |
@@ -865,8 +865,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead) | |||
865 | * only has special meaning to our real parent. | 865 | * only has special meaning to our real parent. |
866 | */ | 866 | */ |
867 | if (!task_detached(tsk) && thread_group_empty(tsk)) { | 867 | if (!task_detached(tsk) && thread_group_empty(tsk)) { |
868 | int signal = (tsk->parent == tsk->real_parent) | 868 | int signal = ptrace_reparented(tsk) ? |
869 | ? tsk->exit_signal : SIGCHLD; | 869 | SIGCHLD : tsk->exit_signal; |
870 | do_notify_parent(tsk, signal); | 870 | do_notify_parent(tsk, signal); |
871 | } else if (tsk->ptrace) { | 871 | } else if (tsk->ptrace) { |
872 | do_notify_parent(tsk, SIGCHLD); | 872 | do_notify_parent(tsk, SIGCHLD); |
@@ -1269,8 +1269,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap, | |||
1269 | return 0; | 1269 | return 0; |
1270 | } | 1270 | } |
1271 | 1271 | ||
1272 | /* traced means p->ptrace, but not vice versa */ | 1272 | traced = ptrace_reparented(p); |
1273 | traced = (p->real_parent != p->parent); | ||
1274 | 1273 | ||
1275 | if (likely(!traced)) { | 1274 | if (likely(!traced)) { |
1276 | struct signal_struct *psig; | 1275 | struct signal_struct *psig; |