VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2013-02-26 20:16:07 -0800 committer: Linus Torvalds <torvalds@linux-foundation.org> 2013-02-26 20:16:07 -0800 commit: d895cb1af15c04c522a25c79cc429076987c089b parent: 9626357371b519f2b955fef399647181034a77fe

Commit Summary:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index b3be2e7c5643..9cf874ce8336 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -19,7 +19,7 @@ static DEFINE_RWLOCK(adfs_dir_lock);
 static int
 adfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
-	struct inode *inode = filp->f_path.dentry->d_inode;
+	struct inode *inode = file_inode(filp);
 	struct super_block *sb = inode->i_sb;
 	struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;
 	struct object_info obj;