commit 59596782090fa68e76cc3b06f66b39813af5cbf8
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Sat Apr 7 16:05:08 2007 -0400
small bug fix
diff --git a/fs/unionfs/odf.c b/fs/unionfs/odf.c
index 0da094c..3a545ef 100644
--- a/fs/unionfs/odf.c
+++ b/fs/unionfs/odf.c
@@ -1338,7 +1338,11 @@ int odf_is_opaque(struct dentry *dentry)
*/
int odf_get_opaque(struct super_block *sb, struct dentry *dentry)
{
- int i, opaque = UNIONFS_D(dentry)->odf_info->opaque;
+ int i, opaque;
+
+ BUG_ON(!UNIONFS_D(dentry)->odf_info);
+
+ opaque = UNIONFS_D(dentry)->odf_info->opaque;
if (opaque == -1)
return -1;
diff --git a/fs/unionfs/unlink.c b/fs/unionfs/unlink.c
index 1e1f8c3..88fd6b6 100644
--- a/fs/unionfs/unlink.c
+++ b/fs/unionfs/unlink.c
@@ -27,7 +27,7 @@ static int unionfs_do_unlink(struct inode *dir, struct dentry
*dentry)
struct iattr attr;
int opaque;
- opaque = odf_get_opaque(dentry->d_sb,dentry);
+ opaque = odf_get_opaque(dentry->d_sb,dentry->d_parent);
if ((err = unionfs_partial_lookup(dentry)))
goto out;
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
