From: Andrew Morton Cc: Erez Zadok Signed-off-by: Andrew Morton --- fs/unionfs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN fs/unionfs/inode.c~embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-vs-git-unionfs fs/unionfs/inode.c --- a/fs/unionfs/inode.c~embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-vs-git-unionfs +++ a/fs/unionfs/inode.c @@ -255,8 +255,8 @@ static struct dentry *unionfs_lookup(str /* save the dentry & vfsmnt from namei */ if (nd) { - path_save.dentry = nd->dentry; - path_save.mnt = nd->mnt; + path_save.dentry = nd->path.dentry; + path_save.mnt = nd->path.mnt; } /* @@ -267,8 +267,8 @@ static struct dentry *unionfs_lookup(str /* restore the dentry & vfsmnt in namei */ if (nd) { - nd->dentry = path_save.dentry; - nd->mnt = path_save.mnt; + nd->path.dentry = path_save.dentry; + nd->path.mnt = path_save.mnt; } if (!IS_ERR(ret)) { if (ret) @@ -861,7 +861,7 @@ static int unionfs_permission(struct ino const int write_mask = (mask & MAY_WRITE) && !(mask & MAY_READ); if (nd) - unionfs_lock_dentry(nd->dentry, UNIONFS_DMUTEX_CHILD); + unionfs_lock_dentry(nd->path.dentry, UNIONFS_DMUTEX_CHILD); if (!UNIONFS_I(inode)->lower_inodes) { if (is_file) /* dirs can be unlinked but chdir'ed to */ @@ -936,7 +936,7 @@ out: unionfs_check_inode(inode); unionfs_check_nd(nd); if (nd) - unionfs_unlock_dentry(nd->dentry); + unionfs_unlock_dentry(nd->path.dentry); return err; } _