From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- fs/hfsplus/dir.c | 2 +- fs/hfsplus/inode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN fs/hfsplus/dir.c~struct-path-convert-hfsplus fs/hfsplus/dir.c --- a/fs/hfsplus/dir.c~struct-path-convert-hfsplus +++ a/fs/hfsplus/dir.c @@ -111,7 +111,7 @@ fail: static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; struct super_block *sb = inode->i_sb; int len, err; char strbuf[HFSPLUS_MAX_STRLEN + 1]; diff -puN fs/hfsplus/inode.c~struct-path-convert-hfsplus fs/hfsplus/inode.c --- a/fs/hfsplus/inode.c~struct-path-convert-hfsplus +++ a/fs/hfsplus/inode.c @@ -97,7 +97,7 @@ static ssize_t hfsplus_direct_IO(int rw, const struct iovec *iov, loff_t offset, unsigned long nr_segs) { struct file *file = iocb->ki_filp; - struct inode *inode = file->f_dentry->d_inode->i_mapping->host; + struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host; return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, offset, nr_segs, hfsplus_get_block, NULL); _