summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-11-05 20:13:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-06 05:50:42 +0300
commit1bb954153aa97702db4363c6746794d097d9c707 (patch)
tree7e2e30e1030f5f283224114c78bb282576f74a5b
parent35af935ee47eb4548e0052733e9d75328e260fa1 (diff)
downloadlinux-1bb954153aa97702db4363c6746794d097d9c707.tar.xz
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>
-rw-r--r--drivers/tty/pty.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 11db7dc8676b..bee9776730fd 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);
}
}