diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:45 -0500 |
commit | c528896004793065b5ffd710e1cd844603ad8518 (patch) | |
tree | 1395db3f610b250b3894d8d10c1420eff040a44b | |
parent | 81454098f7c54118d290cd503bda2a41e3ac43fb (diff) |
[PATCH] struct path: convert hfs
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>
-rw-r--r-- | fs/hfs/dir.c | 2 | ||||
-rw-r--r-- | fs/hfs/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c index 37d681b4f216..e2e0358da335 100644 --- a/fs/hfs/dir.c +++ b/fs/hfs/dir.c | |||
@@ -53,7 +53,7 @@ done: | |||
53 | */ | 53 | */ |
54 | static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir) | 54 | static int hfs_readdir(struct file *filp, void *dirent, filldir_t filldir) |
55 | { | 55 | { |
56 | struct inode *inode = filp->f_dentry->d_inode; | 56 | struct inode *inode = filp->f_path.dentry->d_inode; |
57 | struct super_block *sb = inode->i_sb; | 57 | struct super_block *sb = inode->i_sb; |
58 | int len, err; | 58 | int len, err; |
59 | char strbuf[HFS_MAX_NAMELEN]; | 59 | char strbuf[HFS_MAX_NAMELEN]; |
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 02f5573e0349..5cb7f8fee8d6 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c | |||
@@ -102,7 +102,7 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb, | |||
102 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) | 102 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) |
103 | { | 103 | { |
104 | struct file *file = iocb->ki_filp; | 104 | struct file *file = iocb->ki_filp; |
105 | struct inode *inode = file->f_dentry->d_inode->i_mapping->host; | 105 | struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host; |
106 | 106 | ||
107 | return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, | 107 | return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov, |
108 | offset, nr_segs, hfs_get_block, NULL); | 108 | offset, nr_segs, hfs_get_block, NULL); |