X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fudf%2Fdir.c;h=2391c9150c497dbd27f3b6bf0bf25808a1672889;hb=f1da66e7592c978d9122cb05d8eada1bd900de1a;hp=f5222527fe39fca5cb0d8997c4140ad9959a253b;hpb=0a75c23a009ff65f651532cecc16675d05f4de37;p=powerpc.git

diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index f5222527fe..2391c9150c 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -42,7 +42,7 @@ static int do_udf_readdir(struct inode *, struct file *, filldir_t, void *);
 
 /* readdir and lookup functions */
 
-struct file_operations udf_dir_operations = {
+const struct file_operations udf_dir_operations = {
 	.read			= generic_read_dir,
 	.readdir		= udf_readdir,
 	.ioctl			= udf_ioctl,
@@ -77,7 +77,7 @@ 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;