Module Name: src
Committed By: matt
Date: Thu Apr 21 06:27:17 UTC 2011
Modified Files:
src/sys/miscfs/genfs: genfs_io.c
Log Message:
Move some #ifdefs to prevent a code path change when DEBUG .vs. !DEBUG
Solves problem an assert firing when using NFS on MIPS.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/miscfs/genfs/genfs_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.47 src/sys/miscfs/genfs/genfs_io.c:1.48
--- src/sys/miscfs/genfs/genfs_io.c:1.47 Mon Apr 18 15:53:04 2011
+++ src/sys/miscfs/genfs/genfs_io.c Thu Apr 21 06:27:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.47 2011/04/18 15:53:04 rmind Exp $ */
+/* $NetBSD: genfs_io.c,v 1.48 2011/04/21 06:27:17 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.47 2011/04/18 15:53:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.48 2011/04/21 06:27:17 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -903,19 +903,19 @@
by_list = (uobj->uo_npages <=
((endoff - startoff) >> PAGE_SHIFT) * UVM_PAGE_TREE_PENALTY);
-#if !defined(DEBUG)
/*
* if this vnode is known not to have dirty pages,
* don't bother to clean it out.
*/
if ((vp->v_iflag & VI_ONWORKLST) == 0) {
+#if !defined(DEBUG)
if ((flags & (PGO_FREE|PGO_DEACTIVATE)) == 0) {
goto skip_scan;
}
+#endif /* !defined(DEBUG) */
flags &= ~PGO_CLEANIT;
}
-#endif /* !defined(DEBUG) */
/*
* start the loop. when scanning by list, hold the last page
