patch-2.3.99-pre6 linux/fs/autofs4/expire.c

• Lines: 33
• Date: Fri Apr 21 14:41:36 2000
• Orig file: v2.3.99-pre5/linux/fs/autofs4/expire.c
• Orig date: Tue Apr 11 15:09:21 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/fs/autofs4/expire.c linux/fs/autofs4/expire.c
@@ -1,4 +1,4 @@
-/* -*- linux-c -*- --------------------------------------------------------- *
+/* -*- c -*- --------------------------------------------------------------- *
  *
  * linux/fs/autofs/expire.c
  *
@@ -46,8 +46,9 @@
 		count--;
 	}
 
-	/* Mountpoints don't count */
-	if (d_mountpoint(root)) {
+	/* Mountpoints don't count (either mountee or mounter) */
+	if (d_mountpoint(root) ||
+	    root != root->d_covers) {
 		DPRINTK(("is_tree_busy: mountpoint\n"));
 		count--;
 	}
@@ -75,9 +76,11 @@
 		/* Decrement count for unused children */
 		count += (dentry->d_count - 1);
 
-		/* Mountpoints don't count */
-		if (d_mountpoint(dentry)) {
-			DPRINTK(("is_tree_busy: mountpoint\n"));
+		/* Mountpoints don't count (either mountee or mounter) */
+		if (d_mountpoint(dentry) ||
+		    dentry != dentry->d_covers) {
+			DPRINTK(("is_tree_busy: mountpoint dentry=%p covers=%p mounts=%p\n",
+				 dentry, dentry->d_covers, dentry->d_mounts));
 			adj++;
 		}