Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/miscfs/genfs Move some #ifdefs to prevent a code path ch...



details:   https://anonhg.NetBSD.org/src/rev/f39cd4184876
branches:  trunk
changeset: 764420:f39cd4184876
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Apr 21 06:27:17 2011 +0000

description:
Move some #ifdefs to prevent a code path change when DEBUG .vs. !DEBUG
Solves problem an assert firing when using NFS on MIPS.

diffstat:

 sys/miscfs/genfs/genfs_io.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 9cc2632bca41 -r f39cd4184876 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Thu Apr 21 00:24:07 2011 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Thu Apr 21 06:27:17 2011 +0000
@@ -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



Home | Main Index | Thread Index | Old Index