tty: release BTM while sleeping in block_til_ready

Most tty drivers may block while opening a device.
Since this possibly depends on another thread
closing it first and both threads may need the BTM,
we need to release it here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 8228e61bb54df1cf84fa3f452ba0deddcd0307ba..a11c8c9ca3d4b858029205f9a265b6ee96b04fdb 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1710,7 +1710,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                printk("block_til_ready blocking: ttys%d, count = %d\n",
                       info->line, state->count);
 #endif
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        __set_current_state(TASK_RUNNING);
        remove_wait_queue(&info->open_wait, &wait);

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 911e1da6def225af3163809bd2eeaec394931ab4..07f3ea38b5828eda0a16ceed8b23fdbdee891d79 100644 (file)
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -1486,7 +1486,9 @@ ip2_open( PTTY tty, struct file *pFile )
 
        if ( tty_hung_up_p(pFile) || ( pCh->flags & ASYNC_CLOSING )) {
                if ( pCh->flags & ASYNC_CLOSING ) {
+                       tty_unlock();
                        schedule();
+                       tty_lock();
                }
                if ( tty_hung_up_p(pFile) ) {
                        set_current_state( TASK_RUNNING );
@@ -1548,7 +1550,9 @@ ip2_open( PTTY tty, struct file *pFile )
                        rc = (( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS);
                        break;
                }
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        set_current_state( TASK_RUNNING );
        remove_wait_queue(&pCh->open_wait, &wait);

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 90b3ec0aabdd691f1efaac7d3f76492a9292ac53..f646725bd567ec279541dd968e9a1653746035fe 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1786,7 +1786,9 @@ block_til_ready(struct tty_struct *tty, struct file *filp,
                       tty->name, info->count);
                /**/
 #endif
-                   schedule();
+               tty_unlock();
+               schedule();
+               tty_lock();
        }
        __set_current_state(TASK_RUNNING);
        remove_wait_queue(&info->open_wait, &wait);

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 7be456f760c927e77a0062b5064fe87c2596402b..9f8495b4fc8f5d648529d9c57950718bf11e8fd0 100644 (file)
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1365,7 +1365,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                        retval = -ERESTARTSYS;
                        break;
                }
+               tty_unlock();
                schedule();
+               tty_lock();
        }
 
        set_current_state(TASK_RUNNING);

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 2b03d4d473505a6808612598007fd6cb2ac77871..a2a58004e188eaf2a3be13909c735b7b2a8b39d1 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -3349,7 +3349,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                        printk("%s(%d):block_til_ready blocking on %s count=%d\n",
                                 __FILE__,__LINE__, tty->driver->name, port->count );
                                 
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        
        set_current_state(TASK_RUNNING);

diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 5a602eb7cd2d9c8a5789f5bae59ad147b1dcd873..fef80cfcab5c8caf231b4435d423095dfb90815e 100644 (file)
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -3244,7 +3244,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                }
 
                DBGINFO(("%s block_til_ready wait\n", tty->driver->name));
+               tty_unlock();
                schedule();
+               tty_lock();
        }
 
        set_current_state(TASK_RUNNING);

diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index ac447c7eb572a4f20bbdf51d82f27377fa3cb1e4..e56caf7d82aaaa5e679e6835784ac7714f1cf864 100644 (file)
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -3365,7 +3365,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                        printk("%s(%d):%s block_til_ready() count=%d\n",
                                 __FILE__,__LINE__, tty->driver->name, port->count );
 
+               tty_unlock();
                schedule();
+               tty_lock();
        }
 
        set_current_state(TASK_RUNNING);

diff --git a/drivers/char/tty_port.c b/drivers/char/tty_port.c
index 35eb30402f1889c4e7778e50c96463c652976075..33d37d230f8f4335ee9d85336bcb3816c6e968f0 100644 (file)
--- a/drivers/char/tty_port.c
+++ b/drivers/char/tty_port.c
@@ -294,7 +294,9 @@ int tty_port_block_til_ready(struct tty_port *port,
                        retval = -ERESTARTSYS;
                        break;
                }
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        finish_wait(&port->open_wait, &wait);
 

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 9330edb323e2475bf26bcddb17ca893be58da771..d8204f4ebbb40d05bd2ab7a921206a70856af6c3 100644 (file)
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -1235,7 +1235,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                        retval = -ERESTARTSYS;
                        break;
                }
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        current->state = TASK_RUNNING;
        remove_wait_queue(&info->open_wait, &wait);

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index edcf1cc089d11edccbd1f4e82d40617db3b570ff..0dff3bbddc8b34eb98136380ba909f8009fd3f24 100644 (file)
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -1860,7 +1860,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                printk("block_til_ready blocking: ttys%d, count = %d\n",
                       info->line, state->count);
 #endif
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        current->state = TASK_RUNNING;
        remove_wait_queue(&info->open_wait, &wait);

diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 8e356c5eeae0e826b569e188ab1fa0f50b2efeb4..5696710b6f2dd133e69fc42f1ad0e117d48a9af5 100644 (file)
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -4066,7 +4066,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
                printk("block_til_ready blocking: ttyS%d, count = %d\n",
                       info->line, info->count);
 #endif
+               tty_unlock();
                schedule();
+               tty_lock();
        }
        set_current_state(TASK_RUNNING);
        remove_wait_queue(&info->open_wait, &wait);