n_tty: Remove tty count checks from unthrottle
authorPeter Hurley <peter@hurleysoftware.com>
Sun, 10 Jan 2016 05:45:13 +0000 (21:45 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Jan 2016 19:58:02 +0000 (11:58 -0800)
Since n_tty_check_unthrottle() is only called from n_tty_read()
which only originates from a userspace read(), the tty count cannot
be 0; the read() guarantees the file descriptor has not yet been
released.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_tty.c

index 086fd9983caa4139c401506883687f02b297292f..5ae661cd236eb75f78bd71fc689440ae379e30d4 100644 (file)
@@ -261,8 +261,6 @@ static void n_tty_check_unthrottle(struct tty_struct *tty)
        if (tty->driver->type == TTY_DRIVER_TYPE_PTY) {
                if (chars_in_buffer(tty) > TTY_THRESHOLD_UNTHROTTLE)
                        return;
-               if (!tty->count)
-                       return;
                n_tty_kick_worker(tty);
                tty_wakeup(tty->link);
                return;
@@ -281,8 +279,6 @@ static void n_tty_check_unthrottle(struct tty_struct *tty)
                tty_set_flow_change(tty, TTY_UNTHROTTLE_SAFE);
                if (chars_in_buffer(tty) > TTY_THRESHOLD_UNTHROTTLE)
                        break;
-               if (!tty->count)
-                       break;
                n_tty_kick_worker(tty);
                unthrottled = tty_unthrottle_safe(tty);
                if (!unthrottled)