3 files changed, 4 insertions, 4 deletions

diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 11c301b81c92..a03528ecd276 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -101,7 +101,7 @@ static void show_faulting_vma(unsigned long address, char *buf)
                 if (file) {
                         struct path *path = &file->f_path;
                         nm = d_path(path, buf, PAGE_SIZE - 1);
-                        inode = vma->vm_file->f_path.dentry->d_inode;
+                        inode = file_inode(vma->vm_file);
                         dev = inode->i_sb->s_dev;
                         ino = inode->i_ino;
                 }
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
index 9bd874789ce5..080abf2faf97 100644
--- a/drivers/staging/android/logger.c
+++ b/drivers/staging/android/logger.c
@@ -696,7 +696,7 @@ static long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                         ret = -EBADF;
                         break;
                 }
-                if (!(in_egroup_p(file->f_dentry->d_inode->i_gid) ||
+                if (!(in_egroup_p(file_inode(file)->i_gid) ||
                                 capable(CAP_SYSLOG))) {
                         ret = -EPERM;
                         break;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 29b4ba93ab3c..b05ace4c5f12 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1330,7 +1330,7 @@ static int wait_for_gss_proxy(struct net *net, struct file *file)
 static ssize_t write_gssp(struct file *file, const char __user *buf,
                          size_t count, loff_t *ppos)
 {
-        struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
+        struct net *net = PDE_DATA(file_inode(file));
         char tbuf[20];
         unsigned long i;
         int res;
@@ -1358,7 +1358,7 @@ static ssize_t write_gssp(struct file *file, const char __user *buf,
 static ssize_t read_gssp(struct file *file, char __user *buf,
                          size_t count, loff_t *ppos)
 {
-        struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
+        struct net *net = PDE_DATA(file_inode(file));
         unsigned long p = *ppos;
         char tbuf[10];
         size_t len;