From 52f0444b14fcee31449307b658ae493e3da36fc4 Mon Sep 17 00:00:00 2001
From: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Date: Fri, 8 Dec 2006 02:37:44 -0800
Subject: [PATCH] --- yaml --- r: 43620 b: refs/heads/master c:
 5096e933a943c23bd9314b0ac7e14d07073cb2e5 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/udf/dir.c  | 4 ++--
 trunk/fs/udf/file.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8beb08d1ff6f..e15f6fc2f06b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5495ca657d854ac57733ce5a52eee52255b3f4d8
+refs/heads/master: 5096e933a943c23bd9314b0ac7e14d07073cb2e5
diff --git a/trunk/fs/udf/dir.c b/trunk/fs/udf/dir.c
index 8c28efa3b8ff..2391c9150c49 100644
--- a/trunk/fs/udf/dir.c
+++ b/trunk/fs/udf/dir.c
@@ -77,7 +77,7 @@ const struct file_operations udf_dir_operations = {
 
 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, struct file *filp, filldir_t filldir, void *d
 
 		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 --git a/trunk/fs/udf/file.c b/trunk/fs/udf/file.c
index 7aedd552cba1..d81f2db7b0e3 100644
--- a/trunk/fs/udf/file.c
+++ b/trunk/fs/udf/file.c
@@ -108,7 +108,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 {
 	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;