From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Mon, 19 Nov 2007 01:23:08 +0000 (-0500)
Subject: Unionfs: use f_path instead of f_dentry/mnt
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=19e1e4fdacbe9f1b0ddbbd4f0bff9b80a7136333;p=unionfs-2.6.35.y.git

Unionfs: use f_path instead of f_dentry/mnt

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

diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index 8464fbba7f0..bc221d67731 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/fanout.h b/fs/unionfs/fanout.h
index ec18013d5a3..864383ebf16 100644
--- a/fs/unionfs/fanout.h
+++ b/fs/unionfs/fanout.h
@@ -106,7 +106,7 @@ static inline void unionfs_set_lower_file_idx(struct file *f, int index,
 	UNIONFS_F(f)->lower_files[index] = val;
 	/* save branch ID (may be redundant?) */
 	UNIONFS_F(f)->saved_branch_ids[index] =
-		branch_id((f)->f_dentry->d_sb, index);
+		branch_id((f)->f_path.dentry->d_sb, index);
 }
 
 static inline void unionfs_set_lower_file(struct file *f, struct file *val)