Commit cf62a1a1 authored Nov 01, 2018 by Dmitry Safonov Committed by Greg Kroah-Hartman Dec 05, 2018

tty: Simplify tty->count math in tty_reopen()



As notted by Jiri, tty_ldisc_reinit() shouldn't rely on tty counter.
Simplify math by increasing the counter after reinit success.

Cc: Jiri Slaby <jslaby@suse.com>
Link: lkml.kernel.org/r/<20180829022353.23568-2-dima@arista.com>
Suggested-by: Jiri Slaby <jslaby@suse.com>
Reviewed-by: Jiri Slaby <jslaby@suse.cz>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c96cf923

drivers/tty/tty_io.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -1272,16 +1272,13 @@ static int tty_reopen(struct tty_struct *tty)
		if (retval)
		return retval;

		tty->count++;
		if (tty->ldisc)
		goto out_unlock;

		if (!tty->ldisc)
		retval = tty_ldisc_reinit(tty, tty->termios.c_line);
		if (retval)
		tty->count--;

		out_unlock:
		tty_ldisc_unlock(tty);

		if (retval == 0)
		tty->count++;

		return retval;
		}

Admin message