[src/trunk]: src/sys/uvm Move assertion to make check more clear.

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/199b098cdcab
branches:  trunk
changeset: 751906:199b098cdcab
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Mon Feb 08 00:01:39 2010 +0000

description:
Move assertion to make check more clear.

diffstat:

 sys/uvm/uvm_fault.c |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r 16b396600a2e -r 199b098cdcab sys/uvm/uvm_fault.c
--- a/sys/uvm/uvm_fault.c       Sun Feb 07 23:25:07 2010 +0000
+++ b/sys/uvm/uvm_fault.c       Mon Feb 08 00:01:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_fault.c,v 1.164 2010/02/07 23:25:07 mlelstv Exp $  */
+/*     $NetBSD: uvm_fault.c,v 1.165 2010/02/08 00:01:39 mlelstv Exp $  */
 
 /*
  *
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.164 2010/02/07 23:25:07 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_fault.c,v 1.165 2010/02/08 00:01:39 mlelstv Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -1785,12 +1785,6 @@
            0, flt->access_type & MASK(ufi->entry), ufi->entry->advice,
            PGO_SYNCIO);
        /* locked: pg(if no error) */
-#if 0
-       KASSERT(error != 0 || (pg->flags & PG_BUSY) != 0);
-#else
-       if (error == 0)
-               KASSERT((pg->flags & PG_BUSY) != 0);
-#endif
 
        /*
         * recover from I/O
@@ -1819,6 +1813,8 @@
 
        /* locked: pg */
 
+       KASSERT((pg->flags & PG_BUSY) != 0);
+
        mutex_enter(&uvm_pageqlock);
        uvm_pageactivate(pg);
        mutex_exit(&uvm_pageqlock);