patch-2.4.0-test7 linux/fs/autofs4/expire.c

Next file: linux/fs/bfs/dir.c
Previous file: linux/fs/autofs/root.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test6/linux/fs/autofs4/expire.c linux/fs/autofs4/expire.c
@@ -23,7 +23,9 @@
 	int count;
 
 	spin_lock(&dcache_lock);
-	count = atomic_read(&mnt->mnt_count);
+	count = atomic_read(&mnt->mnt_count) - 2;
+	if (!is_autofs4_dentry(mnt->mnt_mountpoint))
+		count--;
 repeat:
 	next = this_parent->mnt_mounts.next;
 resume:
@@ -33,7 +35,7 @@
 						mnt_child);
 		next = tmp->next;
 		/* Decrement count for unused children */
-		count += atomic_read(&p->mnt_count) - 1;
+		count += atomic_read(&p->mnt_count) - 2;
 		if (!list_empty(&p->mnt_mounts)) {
 			this_parent = p;
 			goto repeat;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)