d_splice bugfix: update dentry in our lookup if needed.

diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index d3e0a4f1ba3ccbe9f5befbb723f28998605e1e98..fcdd7398191e8d4c94353897323cc3b3869428b6 100644 (file)
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -266,8 +266,11 @@ static struct dentry *unionfs_lookup(struct inode *parent,
                nd->dentry = path_save.dentry;
                nd->mnt = path_save.mnt;
        }
-       if (!IS_ERR(ret))
+       if (!IS_ERR(ret)) {
+               if (ret)
+                       dentry = ret;
                unionfs_inherit_mnt(dentry);
+       }
 
        unionfs_check_inode(parent);
        unionfs_check_dentry(dentry);