Merge ../linux-2.6-watchdog-mm

[firefly-linux-kernel-4.4.55.git] / fs / sysv / dir.c

diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c
index f2bef962d30983cc1f43d2d965db2faa3fd1af17..ebf7007fa1612ef41a16317594eeb006264aa7c5 100644 (file)
--- a/fs/sysv/dir.c
+++ b/fs/sysv/dir.c
@@ -70,7 +70,7 @@ fail:
 static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
 {
        unsigned long pos = filp->f_pos;
-       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *inode = filp->f_path.dentry->d_inode;
        struct super_block *sb = inode->i_sb;
        unsigned offset = pos & ~PAGE_CACHE_MASK;
        unsigned long n = pos >> PAGE_CACHE_SHIFT;