4 files changed, 15 insertions, 13 deletions

diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 78f8bda81dae..0893d306ae80 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -419,16 +419,20 @@ fs3270_open(struct inode *inode, struct file *filp)
         struct idal_buffer *ib;
         int minor, rc;
 
-        if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR)
+        if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
-        minor = iminor(filp->f_dentry->d_inode);
+        minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
-                if (!current->signal->tty)
+                struct tty_struct *tty;
+                mutex_lock(&tty_mutex);
+                tty = get_current_tty();
+                if (!tty || tty->driver->major != IBM_TTY3270_MAJOR) {
+                        mutex_unlock(&tty_mutex);
                         return -ENODEV;
-                if (current->signal->tty->driver->major != IBM_TTY3270_MAJOR)
-                        return -ENODEV;
-                minor = current->signal->tty->index + RAW3270_FIRSTMINOR;
+                }
+                minor = tty->index + RAW3270_FIRSTMINOR;
+                mutex_unlock(&tty_mutex);
         }
         /* Check if some other program is already using fullscreen mode. */
         fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c
index 6f43e04dbefd..2d173e5c8a09 100644
--- a/drivers/s390/char/sclp_tty.c
+++ b/drivers/s390/char/sclp_tty.c
@@ -60,8 +60,6 @@ static unsigned short int sclp_tty_chars_count;
 
 struct tty_driver *sclp_tty_driver;
 
-extern struct termios  tty_std_termios;
-
 static struct sclp_ioctls sclp_ioctls;
 static struct sclp_ioctls sclp_ioctls_init =
 {
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 97f75237bed6..31198c8f2718 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -298,13 +298,13 @@ tapechar_open (struct inode *inode, struct file *filp)
         int minor, rc;
 
         DBF_EVENT(6, "TCHAR:open: %i:%i\n",
-                imajor(filp->f_dentry->d_inode),
-                iminor(filp->f_dentry->d_inode));
+                imajor(filp->f_path.dentry->d_inode),
+                iminor(filp->f_path.dentry->d_inode));
 
-        if (imajor(filp->f_dentry->d_inode) != tapechar_major)
+        if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
                 return -ENODEV;
 
-        minor = iminor(filp->f_dentry->d_inode);
+        minor = iminor(filp->f_path.dentry->d_inode);
         device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
         if (IS_ERR(device)) {
                 DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 4717c3611601..09844621edc0 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -1659,7 +1659,7 @@ tty3270_flush_buffer(struct tty_struct *tty)
  * Check for visible/invisible input switches
  */
 static void
-tty3270_set_termios(struct tty_struct *tty, struct termios *old)
+tty3270_set_termios(struct tty_struct *tty, struct ktermios *old)
 {
         struct tty3270 *tp;
         int new;