commit 4973a70413dcd55e7a20d11557ee2d7eaf94f8fd
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Tue May 29 13:54:55 2007 -0400
cleaned up partial_lookup
diff --git a/fs/unionfs/lookup.c b/fs/unionfs/lookup.c
index
c42778011a0e8a86e7b0481cb5f9ca0551b10259..33d0a7ec1df4d73d7e1071d67e1380419a0aa569
100644
--- a/fs/unionfs/lookup.c
+++ b/fs/unionfs/lookup.c
@@ -376,22 +376,18 @@ int unionfs_partial_lookup(struct dentry
goto out;
}
if (tmp)
- goto out;
+ dentry = tmp;
+ /* make sure the dentry has its odf info */
if (UNIONFS_D(dentry) && !UNIONFS_D(dentry)->odf.dentry) {
- tmp = unionfs_lower_dentry_idx(dentry, 0);
- if (dentry->d_inode || (tmp && tmp->d_inode)) {
- err = odf_lookup(dentry->d_parent, dentry, 0);
- if (err)
- goto out;
- BUG_ON(!UNIONFS_D(dentry)->odf.dentry);
- }
+ err = odf_lookup(dentry->d_parent, dentry, 0);
+ BUG_ON(dentry->d_inode && !UNIONFS_D(dentry)->odf.dentry);
}
err = 0;
out:
/* need to change the interface */
- BUG_ON(tmp != dentry);
+ /* BUG_ON(tmp != dentry); */
return err;
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
