aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:04 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:45 -0500
commitf44ea03102a021b9c36cc82c7b6312cd23f23b3d (patch)
treef07f409033f2f2977617f698000054ce257ed87c /fs
parentc528896004793065b5ffd710e1cd844603ad8518 (diff)
[PATCH] struct path: convert hfsplus
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/hfsplus/dir.c2
-rw-r--r--fs/hfsplus/inode.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 7e309751645..e886ac8460d 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -111,7 +111,7 @@ fail:
111 111
112static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir) 112static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
113{ 113{
114 struct inode *inode = filp->f_dentry->d_inode; 114 struct inode *inode = filp->f_path.dentry->d_inode;
115 struct super_block *sb = inode->i_sb; 115 struct super_block *sb = inode->i_sb;
116 int len, err; 116 int len, err;
117 char strbuf[HFSPLUS_MAX_STRLEN + 1]; 117 char strbuf[HFSPLUS_MAX_STRLEN + 1];
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 9e367524963..75e8c4d8aac 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -97,7 +97,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb,
97 const struct iovec *iov, loff_t offset, unsigned long nr_segs) 97 const struct iovec *iov, loff_t offset, unsigned long nr_segs)
98{ 98{
99 struct file *file = iocb->ki_filp; 99 struct file *file = iocb->ki_filp;
100 struct inode *inode = file->f_dentry->d_inode->i_mapping->host; 100 struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;
101 101
102 return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, 102 return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
103 offset, nr_segs, hfsplus_get_block, NULL); 103 offset, nr_segs, hfsplus_get_block, NULL);