Commit 2ce3c10c authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

Revert "tty: Fix pty master poll() after slave closes v2" 



This reverts commit c4dc3046.
This fix is superseded by commit 52bce7f8,
'pty, n_tty: Simplify input processing on final close'.

The final close now waits for input processing to complete before
destroying the pty, so poll() does not need to special case this
condition.

Cc: Francesco Ruggeri <fruggeri@arista.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86f2c00f

drivers/tty/n_tty.c

+2 −7
Original line number Diff line number Diff line
@@ -2399,17 +2399,12 @@ static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file, 


	poll_wait(file, &tty->read_wait, wait);

	poll_wait(file, &tty->write_wait, wait);

	if (test_bit(TTY_OTHER_CLOSED, &tty->flags))

		mask |= POLLHUP;

	if (input_available_p(tty, 1))

		mask |= POLLIN | POLLRDNORM;

	else if (mask & POLLHUP) {

		tty_flush_to_ldisc(tty);

	if (input_available_p(tty, 1))

		mask |= POLLIN | POLLRDNORM;

	}

	if (tty->packet && tty->link->ctrl_status)

		mask |= POLLPRI | POLLIN | POLLRDNORM;

	if (test_bit(TTY_OTHER_CLOSED, &tty->flags))

		mask |= POLLHUP;

	if (tty_hung_up_p(file))

		mask |= POLLHUP;

	if (!(mask & (POLLHUP | POLLIN | POLLRDNORM))) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE