Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f44ea031 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert hfsplus 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c5288960

fs/hfsplus/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

fs/hfsplus/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, 
		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);