diff --git a/[refs] b/[refs] index 1770ce8aad7a..fac31e169920 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c649bb9c55e78dcff0e1383c13d91e0bfc2abb4a +refs/heads/master: dcf258ae682c2dbbe1a34624f2b3f56353d3874d diff --git a/trunk/fs/minix/dir.c b/trunk/fs/minix/dir.c index 2b0a389d1987..ab782c4086f5 100644 --- a/trunk/fs/minix/dir.c +++ b/trunk/fs/minix/dir.c @@ -82,7 +82,7 @@ static inline void *minix_next_entry(void *de, struct minix_sb_info *sbi) static int minix_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;