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 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/dirfops.c b/fs/unionfs/dirfops.c
index 15215608d0e6253dcce21fe9f01a1b86179e36ef..92f91d2afb7070592291d6ab8e597b7a1f443cca 100644 (file)
--- 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 */