aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tty_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tty_io.c')
-rw-r--r--drivers/char/tty_io.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 0c856a6f3677..8a2d26e98ac4 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1629,7 +1629,7 @@ static ssize_t tty_read(struct file * file, char __user * buf, size_t count,
1629 struct tty_ldisc *ld; 1629 struct tty_ldisc *ld;
1630 1630
1631 tty = (struct tty_struct *)file->private_data; 1631 tty = (struct tty_struct *)file->private_data;
1632 inode = file->f_dentry->d_inode; 1632 inode = file->f_path.dentry->d_inode;
1633 if (tty_paranoia_check(tty, inode, "tty_read")) 1633 if (tty_paranoia_check(tty, inode, "tty_read"))
1634 return -EIO; 1634 return -EIO;
1635 if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags))) 1635 if (!tty || (test_bit(TTY_IO_ERROR, &tty->flags)))
@@ -1732,7 +1732,7 @@ static inline ssize_t do_tty_write(
1732 cond_resched(); 1732 cond_resched();
1733 } 1733 }
1734 if (written) { 1734 if (written) {
1735 struct inode *inode = file->f_dentry->d_inode; 1735 struct inode *inode = file->f_path.dentry->d_inode;
1736 inode->i_mtime = current_fs_time(inode->i_sb); 1736 inode->i_mtime = current_fs_time(inode->i_sb);
1737 ret = written; 1737 ret = written;
1738 } 1738 }
@@ -1763,7 +1763,7 @@ static ssize_t tty_write(struct file * file, const char __user * buf, size_t cou
1763 loff_t *ppos) 1763 loff_t *ppos)
1764{ 1764{
1765 struct tty_struct * tty; 1765 struct tty_struct * tty;
1766 struct inode *inode = file->f_dentry->d_inode; 1766 struct inode *inode = file->f_path.dentry->d_inode;
1767 ssize_t ret; 1767 ssize_t ret;
1768 struct tty_ldisc *ld; 1768 struct tty_ldisc *ld;
1769 1769
@@ -2170,7 +2170,7 @@ static void release_dev(struct file * filp)
2170 unsigned long flags; 2170 unsigned long flags;
2171 2171
2172 tty = (struct tty_struct *)filp->private_data; 2172 tty = (struct tty_struct *)filp->private_data;
2173 if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "release_dev")) 2173 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "release_dev"))
2174 return; 2174 return;
2175 2175
2176 check_tty_count(tty, "release_dev"); 2176 check_tty_count(tty, "release_dev");
@@ -2680,7 +2680,7 @@ static unsigned int tty_poll(struct file * filp, poll_table * wait)
2680 int ret = 0; 2680 int ret = 0;
2681 2681
2682 tty = (struct tty_struct *)filp->private_data; 2682 tty = (struct tty_struct *)filp->private_data;
2683 if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "tty_poll")) 2683 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))
2684 return 0; 2684 return 0;
2685 2685
2686 ld = tty_ldisc_ref_wait(tty); 2686 ld = tty_ldisc_ref_wait(tty);
@@ -2696,7 +2696,7 @@ static int tty_fasync(int fd, struct file * filp, int on)
2696 int retval; 2696 int retval;
2697 2697
2698 tty = (struct tty_struct *)filp->private_data; 2698 tty = (struct tty_struct *)filp->private_data;
2699 if (tty_paranoia_check(tty, filp->f_dentry->d_inode, "tty_fasync")) 2699 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
2700 return 0; 2700 return 0;
2701 2701
2702 retval = fasync_helper(fd, filp, on, &tty->fasync); 2702 retval = fasync_helper(fd, filp, on, &tty->fasync);