Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next

[firefly-linux-kernel-4.4.55.git] / fs / logfs / file.c

diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index 3886cded283c4f355f1533712efc12c5e3798c61..c2219a6dd3c8857620dd0a42b7b0f88c88e29828 100644 (file)
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -183,7 +183,7 @@ static int logfs_releasepage(struct page *page, gfp_t only_xfs_uses_this)
 
 long logfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       struct inode *inode = file->f_path.dentry->d_inode;
+       struct inode *inode = file_inode(file);
        struct logfs_inode *li = logfs_inode(inode);
        unsigned int oldflags, flags;
        int err;