more file_inode() open-coded instances

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index fd473639ab70..05400acbc456 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -960,11 +960,10 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
                         loff_t *ppos)
 {
         int i;
-        struct inode *inode = file->f_path.dentry->d_inode;
         struct tty_struct *tty = file_tty(file);
         struct tty_ldisc *ld;
 
-        if (tty_paranoia_check(tty, inode, "tty_read"))
+        if (tty_paranoia_check(tty, file_inode(file), "tty_read"))
                 return -EIO;
         if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))
                 return -EIO;
@@ -1132,12 +1131,11 @@ void tty_write_message(struct tty_struct *tty, char *msg)
 static ssize_t tty_write(struct file *file, const char __user *buf,
                                                 size_t count, loff_t *ppos)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
         struct tty_struct *tty = file_tty(file);
         struct tty_ldisc *ld;
         ssize_t ret;
 
-        if (tty_paranoia_check(tty, inode, "tty_write"))
+        if (tty_paranoia_check(tty, file_inode(file), "tty_write"))
                 return -EIO;
         if (!tty || !tty->ops->write ||
                 (test_bit(TTY_IO_ERROR, &tty->flags)))
@@ -2047,7 +2045,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
         struct tty_ldisc *ld;
         int ret = 0;
 
-        if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))
+        if (tty_paranoia_check(tty, file_inode(filp), "tty_poll"))
                 return 0;
 
         ld = tty_ldisc_ref_wait(tty);
@@ -2063,7 +2061,7 @@ static int __tty_fasync(int fd, struct file *filp, int on)
         unsigned long flags;
         int retval = 0;
 
-        if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
+        if (tty_paranoia_check(tty, file_inode(filp), "tty_fasync"))
                 goto out;
 
         retval = fasync_helper(fd, filp, on, &tty->fasync);
@@ -2637,9 +2635,8 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         void __user *p = (void __user *)arg;
         int retval;
         struct tty_ldisc *ld;
-        struct inode *inode = file->f_dentry->d_inode;
 
-        if (tty_paranoia_check(tty, inode, "tty_ioctl"))
+        if (tty_paranoia_check(tty, file_inode(file), "tty_ioctl"))
                 return -EINVAL;
 
         real_tty = tty_pair_get_tty(tty);
@@ -2780,12 +2777,11 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 static long tty_compat_ioctl(struct file *file, unsigned int cmd,
                                 unsigned long arg)
 {
-        struct inode *inode = file->f_dentry->d_inode;
         struct tty_struct *tty = file_tty(file);
         struct tty_ldisc *ld;
         int retval = -ENOIOCTLCMD;
 
-        if (tty_paranoia_check(tty, inode, "tty_ioctl"))
+        if (tty_paranoia_check(tty, file_inode(file), "tty_ioctl"))
                 return -EINVAL;
 
         if (tty->ops->compat_ioctl) {