Module Name:    src
Committed By:   pooka
Date:           Mon Mar 14 19:05:20 UTC 2011

Modified Files:
        src/tests/fs/vfs: t_renamerace.c

Log Message:
Apparently this way of triggering the msdosfs rename vnode leak
does not bite every time (most commonly observed on the amd64/qemu
runs), so add a race condition catcher.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/fs/vfs/t_renamerace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/fs/vfs/t_renamerace.c
diff -u src/tests/fs/vfs/t_renamerace.c:1.21 src/tests/fs/vfs/t_renamerace.c:1.22
--- src/tests/fs/vfs/t_renamerace.c:1.21	Sun Mar  6 16:00:16 2011
+++ src/tests/fs/vfs/t_renamerace.c	Mon Mar 14 19:05:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_renamerace.c,v 1.21 2011/03/06 16:00:16 pooka Exp $	*/
+/*	$NetBSD: t_renamerace.c,v 1.22 2011/03/14 19:05:19 pooka Exp $	*/
 
 /*
  * Modified for rump and atf from a program supplied
@@ -113,8 +113,18 @@
 	if (FSTYPE_LFS(tc))
 		abort();
 
-	if (FSTYPE_MSDOS(tc))
+	if (FSTYPE_MSDOS(tc)) {
 		atf_tc_expect_fail("PR kern/44661");
+		/*
+		 * XXX: race does not trigger every time at least
+		 * on amd64/qemu.
+		 */
+		if (msdosfs_fstest_unmount(tc, mp, 0) != 0) {
+			rump_pub_vfs_mount_print(mp, 1);
+			atf_tc_fail_errno("unmount failed");
+		}
+		atf_tc_fail("race did not trigger this time");
+	}
 }
 
 static void

Reply via email to