diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:50 -0500 |
commit | 5096e933a943c23bd9314b0ac7e14d07073cb2e5 (patch) | |
tree | fe226d194508aa5c18a4bc0fee79b5c05bc96468 /fs/udf | |
parent | 5495ca657d854ac57733ce5a52eee52255b3f4d8 (diff) |
[PATCH] struct path: convert udf
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/udf')
-rw-r--r-- | fs/udf/dir.c | 4 | ||||
-rw-r--r-- | fs/udf/file.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c index 8c28efa3b8ff..2391c9150c49 100644 --- a/fs/udf/dir.c +++ b/fs/udf/dir.c | |||
@@ -77,7 +77,7 @@ const struct file_operations udf_dir_operations = { | |||
77 | 77 | ||
78 | int udf_readdir(struct file *filp, void *dirent, filldir_t filldir) | 78 | int udf_readdir(struct file *filp, void *dirent, filldir_t filldir) |
79 | { | 79 | { |
80 | struct inode *dir = filp->f_dentry->d_inode; | 80 | struct inode *dir = filp->f_path.dentry->d_inode; |
81 | int result; | 81 | int result; |
82 | 82 | ||
83 | lock_kernel(); | 83 | lock_kernel(); |
@@ -225,7 +225,7 @@ do_udf_readdir(struct inode * dir, struct file *filp, filldir_t filldir, void *d | |||
225 | 225 | ||
226 | if ( cfi.fileCharacteristics & FID_FILE_CHAR_PARENT ) | 226 | if ( cfi.fileCharacteristics & FID_FILE_CHAR_PARENT ) |
227 | { | 227 | { |
228 | iblock = parent_ino(filp->f_dentry); | 228 | iblock = parent_ino(filp->f_path.dentry); |
229 | flen = 2; | 229 | flen = 2; |
230 | memcpy(fname, "..", flen); | 230 | memcpy(fname, "..", flen); |
231 | dt_type = DT_DIR; | 231 | dt_type = DT_DIR; |
diff --git a/fs/udf/file.c b/fs/udf/file.c index 7aedd552cba1..d81f2db7b0e3 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
@@ -108,7 +108,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
108 | { | 108 | { |
109 | ssize_t retval; | 109 | ssize_t retval; |
110 | struct file *file = iocb->ki_filp; | 110 | struct file *file = iocb->ki_filp; |
111 | struct inode *inode = file->f_dentry->d_inode; | 111 | struct inode *inode = file->f_path.dentry->d_inode; |
112 | int err, pos; | 112 | int err, pos; |
113 | size_t count = iocb->ki_left; | 113 | size_t count = iocb->ki_left; |
114 | 114 | ||