From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 19 Nov 2007 01:27:01 +0000 (-0500)
Subject: Unionfs: use f_path not f_dentry/f_mnt
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=7d0f10f1a1cc8eafb7d06f7124cc05a45c7ea10f;p=unionfs-odf.git

Unionfs: use f_path not f_dentry/f_mnt

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index 8464fbba7f..bc221d6773 100644
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -437,7 +437,7 @@ void __unionfs_check_nd(const struct nameidata *nd,
 	if (nd->flags & LOOKUP_OPEN) {
 		file = nd->intent.open.file;
 		if (unlikely(file->f_path.dentry &&
-			     strcmp(file->f_dentry->d_sb->s_type->name,
+			     strcmp(file->f_path.dentry->d_sb->s_type->name,
 				    UNIONFS_NAME))) {
 			PRINT_CALLER(fname, fxn, line);
 			pr_debug(" CND1: lower_file of type %s\n",
diff --git a/fs/unionfs/dirfops.c b/fs/unionfs/dirfops.c
index 15215608d0..92f91d2afb 100644
--- a/fs/unionfs/dirfops.c
+++ b/fs/unionfs/dirfops.c
@@ -38,7 +38,7 @@ static int unionfs_readdir(struct file *file, void *dirent, filldir_t filldir)
 	if (unlikely(err))
 		goto out;
 
-	inode = file->f_dentry->d_inode;
+	inode = file->f_path.dentry->d_inode;
 
 	/* Get the odf/ic file */
 	/* FIXME: this should be saved somewhere, also check mtime */