diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:48 -0500 |
commit | d28c91740ae2cd1d963f9e4e3889789894cb6d52 (patch) | |
tree | 0f519133422e1248b6e7519960877dd062f4c2b5 /fs/ocfs2/aops.c | |
parent | 6db5fc5d536560e31978c6911b1f5662e42083ac (diff) |
[PATCH] struct path: convert ocfs2
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/ocfs2/aops.c')
-rw-r--r-- | fs/ocfs2/aops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 2f7268e81520..ef6cd30108a9 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
@@ -595,7 +595,7 @@ static void ocfs2_dio_end_io(struct kiocb *iocb, | |||
595 | ssize_t bytes, | 595 | ssize_t bytes, |
596 | void *private) | 596 | void *private) |
597 | { | 597 | { |
598 | struct inode *inode = iocb->ki_filp->f_dentry->d_inode; | 598 | struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode; |
599 | 599 | ||
600 | /* this io's submitter should not have unlocked this before we could */ | 600 | /* this io's submitter should not have unlocked this before we could */ |
601 | BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); | 601 | BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); |
@@ -611,7 +611,7 @@ static ssize_t ocfs2_direct_IO(int rw, | |||
611 | unsigned long nr_segs) | 611 | unsigned long nr_segs) |
612 | { | 612 | { |
613 | struct file *file = iocb->ki_filp; | 613 | struct file *file = iocb->ki_filp; |
614 | struct inode *inode = file->f_dentry->d_inode->i_mapping->host; | 614 | struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host; |
615 | int ret; | 615 | int ret; |
616 | 616 | ||
617 | mlog_entry_void(); | 617 | mlog_entry_void(); |