Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
---
fs/unionfs/debug.c | 2 +-
fs/unionfs/fanout.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index 8464fbb..bc221d6 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 ec18013..864383e 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)
--
1.5.2.2
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
