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 8464fbba7f0a1cc6c9478c881765d525c3d99185..bc221d677315cec1f320e39b8f9c4b6467beacc2 100644 (file)
--- 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 ec18013d5a30ab57a702931887acfcb3b4a0777a..864383ebf16b69a22de21ab4f3198287c90d1eec 100644 (file)
--- 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)