Merge branch 'kvm-arm/vgic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_file.c

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 67284edb84d74d2156283c3c34e1b28d179b4861..f03bf1a456fbcacf43cc4999124a5d9072d733f0 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -811,7 +811,7 @@ xfs_file_fallocate(
        loff_t          offset,
        loff_t          len)
 {
-       struct inode    *inode = file->f_path.dentry->d_inode;
+       struct inode    *inode = file_inode(file);
        long            error;
        loff_t          new_size = 0;
        xfs_flock64_t   bf;
@@ -912,7 +912,7 @@ xfs_file_readdir(
        void            *dirent,
        filldir_t       filldir)
 {
-       struct inode    *inode = filp->f_path.dentry->d_inode;
+       struct inode    *inode = file_inode(filp);
        xfs_inode_t     *ip = XFS_I(inode);
        int             error;
        size_t          bufsize;