26 files changed, 108 insertions, 171 deletions

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 280ded8b79ba..8538015ed4a0 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -171,12 +171,10 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
                               unsigned long nr_segs, loff_t offset)
 {
         int rc;
-        struct super_block *sb;
-        struct hypfs_sb_info *fs_info;
+        struct super_block *sb = file_inode(iocb->ki_filp)->i_sb;
+        struct hypfs_sb_info *fs_info = sb->s_fs_info;
         size_t count = iov_length(iov, nr_segs);
 
-        sb = iocb->ki_filp->f_path.dentry->d_inode->i_sb;
-        fs_info = sb->s_fs_info;
         /*
          * Currently we only allow one update per second for two reasons:
          * 1. diag 204 is VERY expensive
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 4929502c1372..ce130493b802 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -71,7 +71,7 @@ static ssize_t msr_read(struct file *file, char __user *buf,
         u32 __user *tmp = (u32 __user *) buf;
         u32 data[2];
         u32 reg = *ppos;
-        int cpu = iminor(file->f_path.dentry->d_inode);
+        int cpu = iminor(file_inode(file));
         int err = 0;
         ssize_t bytes = 0;
 
@@ -99,7 +99,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
         const u32 __user *tmp = (const u32 __user *)buf;
         u32 data[2];
         u32 reg = *ppos;
-        int cpu = iminor(file->f_path.dentry->d_inode);
+        int cpu = iminor(file_inode(file));
         int err = 0;
         ssize_t bytes = 0;
 
@@ -125,7 +125,7 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
 {
         u32 __user *uregs = (u32 __user *)arg;
         u32 regs[8];
-        int cpu = iminor(file->f_path.dentry->d_inode);
+        int cpu = iminor(file_inode(file));
         int err;
 
         switch (ioc) {
@@ -171,13 +171,12 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
 
 static int msr_open(struct inode *inode, struct file *file)
 {
-        unsigned int cpu;
+        unsigned int cpu = iminor(file_inode(file));
         struct cpuinfo_x86 *c;
 
         if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
 
-        cpu = iminor(file->f_path.dentry->d_inode);
         if (cpu >= nr_cpu_ids || !cpu_online(cpu))
                 return -ENXIO;  /* No such CPU */
 
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));