commit 009c28d8e8cf26b49af77a00699d4eaf7195d01b
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sun May 20 14:49:22 2007 -0400
applied ezk changes to d_splice fix so both branches are synced
diff --git a/fs/unionfs/inode.c b/fs/unionfs/inode.c
index d301e88..88b4613 100644
--- a/fs/unionfs/inode.c
+++ b/fs/unionfs/inode.c
@@ -138,16 +138,17 @@ static struct dentry *unionfs_lookup(struct inode *parent,
/* The locking is done by unionfs_lookup_backend. */
ret = unionfs_lookup_backend(dentry, nd, INTERPOSE_LOOKUP);
- if (!IS_ERR(ret) && ret)
- dentry = ret;
/* restore the dentry & vfsmnt in namei */
if (nd) {
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);
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
