Merge 3.9-rc3 into tty-next

1 files changed, 24 insertions, 18 deletions

diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index cc206eda245c..8035145f043b 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -299,7 +299,7 @@ static int line_activate(struct tty_port *port, struct tty_struct *tty)
                 return ret;
 
         if (!line->sigio) {
-                chan_enable_winch(line->chan_out, tty);
+                chan_enable_winch(line->chan_out, port);
                 line->sigio = 1;
         }
 
@@ -309,8 +309,22 @@ static int line_activate(struct tty_port *port, struct tty_struct *tty)
         return 0;
 }
 
+static void unregister_winch(struct tty_struct *tty);
+
+static void line_destruct(struct tty_port *port)
+{
+        struct tty_struct *tty = tty_port_tty_get(port);
+        struct line *line = tty->driver_data;
+
+        if (line->sigio) {
+                unregister_winch(tty);
+                line->sigio = 0;
+        }
+}
+
 static const struct tty_port_operations line_port_ops = {
         .activate = line_activate,
+        .destruct = line_destruct,
 };
 
 int line_open(struct tty_struct *tty, struct file *filp)
@@ -334,18 +348,6 @@ int line_install(struct tty_driver *driver, struct tty_struct *tty,
         return 0;
 }
 
-static void unregister_winch(struct tty_struct *tty);
-
-void line_cleanup(struct tty_struct *tty)
-{
-        struct line *line = tty->driver_data;
-
-        if (line->sigio) {
-                unregister_winch(tty);
-                line->sigio = 0;
-        }
-}
-
 void line_close(struct tty_struct *tty, struct file * filp)
 {
         struct line *line = tty->driver_data;
@@ -595,7 +597,7 @@ struct winch {
         int fd;
         int tty_fd;
         int pid;
-        struct tty_struct *tty;
+        struct tty_port *port;
         unsigned long stack;
         struct work_struct work;
 };
@@ -649,7 +651,7 @@ static irqreturn_t winch_interrupt(int irq, void *data)
                         goto out;
                 }
         }
-        tty = winch->tty;
+        tty = tty_port_tty_get(winch->port);
         if (tty != NULL) {
                 line = tty->driver_data;
                 if (line != NULL) {
@@ -657,6 +659,7 @@ static irqreturn_t winch_interrupt(int irq, void *data)
                                          &tty->winsize.ws_col);
                         kill_pgrp(tty->pgrp, SIGWINCH, 1);
                 }
+                tty_kref_put(tty);
         }
  out:
         if (winch->fd != -1)
@@ -664,7 +667,7 @@ static irqreturn_t winch_interrupt(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
+void register_winch_irq(int fd, int tty_fd, int pid, struct tty_port *port,
                         unsigned long stack)
 {
         struct winch *winch;
@@ -679,7 +682,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
                                    .fd          = fd,
                                    .tty_fd      = tty_fd,
                                    .pid         = pid,
-                                   .tty         = tty,
+                                   .port        = port,
                                    .stack       = stack });
 
         if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
@@ -708,15 +711,18 @@ static void unregister_winch(struct tty_struct *tty)
 {
         struct list_head *ele, *next;
         struct winch *winch;
+        struct tty_struct *wtty;
 
         spin_lock(&winch_handler_lock);
 
         list_for_each_safe(ele, next, &winch_handlers) {
                 winch = list_entry(ele, struct winch, list);
-                if (winch->tty == tty) {
+                wtty = tty_port_tty_get(winch->port);
+                if (wtty == tty) {
                         free_winch(winch);
                         break;
                 }
+                tty_kref_put(wtty);
         }
         spin_unlock(&winch_handler_lock);
 }