GIT: unionfs2-2.6.27.y: invariants: don't complain if no lower dentry of a deleted dentry

Erez Zadok ezk at fsl.cs.sunysb.edu
Thu Aug 12 23:16:31 EDT 2010


commit e2e535353fc53c8937318d7de2135cb28e6ba44e
Author: Erez_Zadok <ezk at cs.sunysb.edu>
Date:   Mon May 28 23:24:58 2007 -0400

    invariants: don't complain if no lower dentry of a deleted dentry
    
    Signed-off-by: Erez Zadok <ezk at cs.sunysb.edu>

diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index 821ef65..ab168cc 100644
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -148,9 +148,10 @@ void __unionfs_check_dentry(const struct dentry *dentry,
 	/*
 	 * Directories can have NULL lower inodes in b/t start/end, but NOT
 	 * if at the start/end range.  Ignore this rule, however, if this is
-	 * a NULL dentry.
+	 * a NULL dentry or a deleted dentry.
 	 */
-	if (inode && !(inode && S_ISDIR(inode->i_mode) &&
+	if (!d_deleted((struct dentry *) dentry) &&
+	    inode && !(inode && S_ISDIR(inode->i_mode) &&
 		       bindex > dstart && bindex < dend)) {
 	  PRINT_CALLER;
 	  printk(" CD2: dentry/lower=%p:%p(%p) bindex=%d dstart/end=%d:%d\n",


More information about the unionfs-cvs mailing list