Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ee175d9 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Don't hold tty_lock for ldisc release 



The tty->ldisc_sem write lock is sufficient for serializing changes
to tty->ldisc; holding the tty lock is not required.

Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1bc8cde4

drivers/tty/tty_ldisc.c

+2 −4
Original line number Diff line number Diff line
@@ -764,6 +764,8 @@ static void tty_ldisc_kill(struct tty_struct *tty) 
 *	Called during the final close of a tty/pty pair in order to shut down

 *	the line discpline layer. On exit the ldisc assigned is N_TTY and the

 *	ldisc has not been opened.

 *

 *	Holding ldisc_sem write lock serializes tty->ldisc changes.

 */



void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
@@ -776,13 +778,9 @@ void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty) 
	tty_ldisc_debug(tty, "closing ldisc: %p\n", tty->ldisc);



	tty_ldisc_lock_pair(tty, o_tty);

	tty_lock_pair(tty, o_tty);



	tty_ldisc_kill(tty);

	if (o_tty)

		tty_ldisc_kill(o_tty);



	tty_unlock_pair(tty, o_tty);

	tty_ldisc_unlock_pair(tty, o_tty);



	/* And the memory resources remaining (buffers, termios) will be