diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-12-24 23:30:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-31 14:41:18 -0800 |
| commit | 241ceee0b442c69226fb882d61d9b9785743898f (patch) | |
| tree | 398eb111e2addcc7e5cc1f1c30006b9ec92b7a0e /kernel/exit.c | |
| parent | 9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a (diff) | |
| download | linux-241ceee0b442c69226fb882d61d9b9785743898f.tar.gz linux-241ceee0b442c69226fb882d61d9b9785743898f.tar.bz2 linux-241ceee0b442c69226fb882d61d9b9785743898f.zip | |
[PATCH] restore ->pdeath_signal behaviour
Commit b2b2cbc4b2a2f389442549399a993a8306420baf introduced a user-
visible change: ->pdeath_signal is sent only when the entire thread
group exits.
While this change is imho good, it may break things. So restore the
old behaviour for now.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
To: Albert Cahalan <acahalan@gmail.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Linus Torvalds <torvalds@osdl.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Qi Yong <qiyong@fc-cn.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 46cf6b681460..35401720635b 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -597,6 +597,10 @@ choose_new_parent(struct task_struct *p, struct task_struct *reaper) static void reparent_thread(struct task_struct *p, struct task_struct *father, int traced) { + if (p->pdeath_signal) + /* We already hold the tasklist_lock here. */ + group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); + /* Move the child from its dying parent to the new one. */ if (unlikely(traced)) { /* Preserve ptrace links if someone else is tracing this child. */ @@ -631,10 +635,6 @@ reparent_thread(struct task_struct *p, struct task_struct *father, int traced) /* We don't want people slaying init. */ if (p->exit_signal != -1) p->exit_signal = SIGCHLD; - - if (p->pdeath_signal) - /* We already hold the tasklist_lock here. */ - group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); /* If we'd notified the old parent about this child's death, * also notify the new parent. |