tty: Simplify tty_ldisc_release() interface

Passing the 'other' tty to tty_ldisc_release() only makes sense
for a pty pair; make o_tty function local instead.

Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index f5b62b99489d8da322b2a4d2045cad9695b80c5e..cd9550820a5893fc7b5ce8b66e9d1e4ff654c9d5 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1892,7 +1892,7 @@ int tty_release(struct inode *inode, struct file *filp)
        /*
         * Ask the line discipline code to release its structures
         */
-       tty_ldisc_release(tty, o_tty);
+       tty_ldisc_release(tty);
 
        /* Wait for pending work before tty destruction commmences */
        tty_flush_works(tty);

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 49001fa2ea2f0084480c2d09ba4c1cd325b12851..1c4d7b6d8a76f06d7615222b7a353f7c077e8836 100644 (file)
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -756,18 +756,17 @@ static void tty_ldisc_kill(struct tty_struct *tty)
 
 /**
  *     tty_ldisc_release               -       release line discipline
- *     @tty: tty being shut down
- *     @o_tty: pair tty for pty/tty pairs
- *
- *     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.
+ *     @tty: tty being shut down (or one end of pty pair)
  *
- *     Holding ldisc_sem write lock serializes tty->ldisc changes.
+ *     Called during the final close of a tty or a pty pair in order to shut
+ *     down the line discpline layer. On exit, each ldisc assigned is N_TTY and
+ *     each ldisc has not been opened.
  */
 
-void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty)
+void tty_ldisc_release(struct tty_struct *tty)
 {
+       struct tty_struct *o_tty = tty->link;
+
        /*
         * Shutdown this line discipline. As this is the final close,
         * it does not race with the set_ldisc code path.

diff --git a/include/linux/tty.h b/include/linux/tty.h
index 35b29f0750f83537f5923ebffb721f12b5507a78..af1a7f3e4e4acc5e6e025a268bbaa7343d34cc8f 100644 (file)
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -557,7 +557,7 @@ extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
 extern int tty_unregister_ldisc(int disc);
 extern int tty_set_ldisc(struct tty_struct *tty, int ldisc);
 extern int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty);
-extern void tty_ldisc_release(struct tty_struct *tty, struct tty_struct *o_tty);
+extern void tty_ldisc_release(struct tty_struct *tty);
 extern void tty_ldisc_init(struct tty_struct *tty);
 extern void tty_ldisc_deinit(struct tty_struct *tty);
 extern void tty_ldisc_begin(void);