From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- fs/udf/dir.c | 4 ++-- fs/udf/file.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN fs/udf/dir.c~struct-path-convert-udf fs/udf/dir.c --- a/fs/udf/dir.c~struct-path-convert-udf +++ a/fs/udf/dir.c @@ -77,7 +77,7 @@ const struct file_operations udf_dir_ope int udf_readdir(struct file *filp, void *dirent, filldir_t filldir) { - struct inode *dir = filp->f_dentry->d_inode; + struct inode *dir = filp->f_path.dentry->d_inode; int result; lock_kernel(); @@ -225,7 +225,7 @@ do_udf_readdir(struct inode * dir, struc if ( cfi.fileCharacteristics & FID_FILE_CHAR_PARENT ) { - iblock = parent_ino(filp->f_dentry); + iblock = parent_ino(filp->f_path.dentry); flen = 2; memcpy(fname, "..", flen); dt_type = DT_DIR; diff -puN fs/udf/file.c~struct-path-convert-udf fs/udf/file.c --- a/fs/udf/file.c~struct-path-convert-udf +++ a/fs/udf/file.c @@ -115,7 +115,7 @@ static ssize_t udf_file_aio_write(struct { ssize_t retval; struct file *file = iocb->ki_filp; - struct inode *inode = file->f_dentry->d_inode; + struct inode *inode = file->f_path.dentry->d_inode; int err, pos; size_t count = iocb->ki_left; _