diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-11-30 13:18:45 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:18:08 -0800 |
| commit | 5ec93d1154fd1e269162398f8e70efc7e004485d (patch) | |
| tree | 2a76835812d3502b036a7234faeaa0f6ba0356da /drivers | |
| parent | 38c70b27f9502c31c1d0c29676275f7362cdb0d9 (diff) | |
| download | linux-5ec93d1154fd1e269162398f8e70efc7e004485d.tar.gz linux-5ec93d1154fd1e269162398f8e70efc7e004485d.tar.bz2 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 'drivers')
| -rw-r--r-- | drivers/char/tty_io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index cc941a3504d7..a19fef2093f1 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -707,6 +707,8 @@ void disassociate_ctty(int on_exit) struct tty_struct *tty; struct pid *tty_pgrp = NULL; + if (!current->signal->leader) + return; tty = get_current_tty(); if (tty) { @@ -772,8 +774,7 @@ void no_tty(void) { struct task_struct *tsk = current; lock_kernel(); - if (tsk->signal->leader) - disassociate_ctty(0); + disassociate_ctty(0); unlock_kernel(); proc_clear_tty(tsk); } |