On 02/05/2013 09:20 PM, Peter Hurley wrote:

The question is obvious: why?

The waiters usually don't care about ldisc.

> Signed-off-by: Peter Hurley <pe...@hurleysoftware.com>
> ---
>  drivers/tty/tty_ldisc.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
> index c903778..8a86a72 100644
> --- a/drivers/tty/tty_ldisc.c
> +++ b/drivers/tty/tty_ldisc.c
> @@ -604,6 +604,12 @@ static bool tty_ldisc_hangup_halt(struct tty_struct *tty)
>  
>       clear_bit(TTY_LDISC, &tty->flags);
>  
> +     /* Wakeup waiters so they can discover the tty is hupping, abort
> +      * their i/o loops, and release their ldisc references
> +      */
> +     wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
> +     wake_up_interruptible_poll(&tty->read_wait, POLLIN);
> +
>       if (tty->ldisc) {       /* Not yet closed */
>               tty_unlock(tty);
>  
> @@ -875,12 +881,6 @@ void tty_ldisc_hangup(struct tty_struct *tty)
>               tty_ldisc_deref(ld);
>       }
>       /*
> -      * FIXME: Once we trust the LDISC code better we can wait here for
> -      * ldisc completion and fix the driver call race
> -      */
> -     wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
> -     wake_up_interruptible_poll(&tty->read_wait, POLLIN);
> -     /*
>        * Shutdown the current line discipline, and reset it to
>        * N_TTY if need be.
>        *
> 


-- 
js
suse labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to