diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-11-05 12:13:04 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 18:50:42 -0800 |
| commit | 1bb954153aa97702db4363c6746794d097d9c707 (patch) | |
| tree | 7e2e30e1030f5f283224114c78bb282576f74a5b /drivers/tty/pty.c | |
| parent | 35af935ee47eb4548e0052733e9d75328e260fa1 (diff) | |
| download | op-kernel-dev-1bb954153aa97702db4363c6746794d097d9c707.zip op-kernel-dev-1bb954153aa97702db4363c6746794d097d9c707.tar.gz | |
pty: Don't drop pty master tty lock to hangup slave
With the revised tty lock order and lockdep annotation, claiming
the pty slave lock is now safe while still holding the pty master lock.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/pty.c')
| -rw-r--r-- | drivers/tty/pty.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 11db7dc..bee9776 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -66,9 +66,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp) mutex_unlock(&devpts_mutex); } #endif - tty_unlock(tty); tty_vhangup(tty->link); - tty_lock(tty); } } |
