summaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorAlan Cox2009-11-30 14:18:45 +0100
committerGreg Kroah-Hartman2009-12-12 00:18:08 +0100
commit5ec93d1154fd1e269162398f8e70efc7e004485d (patch)
tree2a76835812d3502b036a7234faeaa0f6ba0356da /kernel/exit.c
parenttty: Push the bkl down a bit in the hangup code (diff)
downloadkernel-qcow2-linux-5ec93d1154fd1e269162398f8e70efc7e004485d.tar.gz
kernel-qcow2-linux-5ec93d1154fd1e269162398f8e70efc7e004485d.tar.xz
kernel-qcow2-linux-5ec93d1154fd1e269162398f8e70efc7e004485d.zip
tty: Move the leader test in disassociate
There are two call points, both want to check that tty->signal->leader is set. Move the test into disassociate_ctty() as that will make locking changes easier in a bit Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 1143012951e9..6f50ef55a6f3 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -971,7 +971,7 @@ NORET_TYPE void do_exit(long code)
exit_thread();
cgroup_exit(tsk, 1);
- if (group_dead && tsk->signal->leader)
+ if (group_dead)
disassociate_ctty(1);
module_put(task_thread_info(tsk)->exec_domain->module);