Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull  more VFS bits from Al Viro:
 "Unfortunately, it looks like xattr series will have to wait until the
  next cycle ;-/

  This pile contains 9p cleanups and fixes (races in v9fs_fid_add()
  etc), fixup for nommu breakage in shmem.c, several cleanups and a bit
  more file_inode() work"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  constify path_get/path_put and fs_struct.c stuff
  fix nommu breakage in shmem.c
  cache the value of file_inode() in struct file
  9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry
  9p: make sure ->lookup() adds fid to the right dentry
  9p: untangle ->lookup() a bit
  9p: double iput() in ->lookup() if d_materialise_unique() fails
  9p: v9fs_fid_add() can't fail now
  v9fs: get rid of v9fs_dentry
  9p: turn fid->dlist into hlist
  9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine
  more file_inode() open-coded instances
  selinux: opened file can't have NULL or negative ->f_path.dentry

(In the meantime, the hlist traversal macros have changed, so this
required a semantic conflict fixup for the newly hlistified fid->dlist)

2 files changed, 13 insertions, 17 deletions

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 195d56d8a1ee..e336b281b847 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -580,7 +580,7 @@ static int do_devinfo_ioctl(struct comedi_device *dev,
                             struct comedi_devinfo __user *arg,
                             struct file *file)
 {
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_subdevice *s;
         struct comedi_devinfo devinfo;
@@ -1615,7 +1615,7 @@ static int do_poll_ioctl(struct comedi_device *dev, unsigned int arg,
 static long comedi_unlocked_ioctl(struct file *file, unsigned int cmd,
                                   unsigned long arg)
 {
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_device *dev = comedi_dev_from_file_info(info);
         int rc;
@@ -1743,7 +1743,7 @@ static struct vm_operations_struct comedi_vm_ops = {
 
 static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_device *dev = comedi_dev_from_file_info(info);
         struct comedi_subdevice *s;
@@ -1823,7 +1823,7 @@ done:
 static unsigned int comedi_poll(struct file *file, poll_table *wait)
 {
         unsigned int mask = 0;
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_device *dev = comedi_dev_from_file_info(info);
         struct comedi_subdevice *s;
@@ -1869,7 +1869,7 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
         struct comedi_async *async;
         int n, m, count = 0, retval = 0;
         DECLARE_WAITQUEUE(wait, current);
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_device *dev = comedi_dev_from_file_info(info);
 
@@ -1964,7 +1964,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
         struct comedi_async *async;
         int n, m, count = 0, retval = 0;
         DECLARE_WAITQUEUE(wait, current);
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_file_info *info = comedi_file_info_from_minor(minor);
         struct comedi_device *dev = comedi_dev_from_file_info(info);
 
@@ -2133,7 +2133,7 @@ ok:
 
 static int comedi_fasync(int fd, struct file *file, int on)
 {
-        const unsigned minor = iminor(file->f_dentry->d_inode);
+        const unsigned minor = iminor(file_inode(file));
         struct comedi_device *dev = comedi_dev_from_minor(minor);
 
         if (!dev)
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) {