GIT: unionfs2-2.6.27.y: Revert "invariants: don't complain about directories with some NULL lower objects"

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


commit 652f0b4637b14fec241fdf862d0143a8b74655c7
Author: Erez_Zadok <ezk at cs.sunysb.edu>
Date:   Mon May 28 19:45:45 2007 -0400

    Revert "invariants: don't complain about directories with some NULL lower objects"
    
    This reverts commit 9d8ee83d478be30faf351af7628066ec6658efb5.

diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h
index 753eb2a..bb8d2b8 100644
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -510,19 +510,9 @@ static inline void unionfs_mntput(struct dentry *dentry, int bindex)
 			return;
 		if (!mnt && bindex >= 0) {
 #ifdef UNIONFS_DEBUG
-			/*
-			 * Directories can have NULL lower objects in
-			 * between start/end, but NOT if at the start/end
-			 * range.  We cannot verify that this dentry is a
-			 * type=DIR, because it may already be a negative
-			 * dentry.  But if dbstart is greater than dbend, we
-			 * know that this couldn't have been a regular file:
-			 * it had to have been a directory.
-			 */
-			if (!(bindex > dbstart(dentry) && bindex < dbend(dentry)))
-				printk(KERN_WARNING
-				       "unionfs_mntput: mnt=%p bindex=%d (%s:%d)\n",
-				       mnt, bindex, fxn, line);
+			printk(KERN_DEBUG
+			       "unionfs_mntput: mnt=%p bindex=%d\n",
+			       mnt, bindex);
 #endif /* UNIONFS_DEBUG */
 			return;
 		}


More information about the unionfs-cvs mailing list