[src/uebayasi-xip]: src/sys/miscfs/genfs genfs_do_getpages_xip_io_done: Adjus...

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

details:   https://anonhg.NetBSD.org/src/rev/843fc2415809
branches:  uebayasi-xip
changeset: 751885:843fc2415809
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Nov 20 08:03:22 2010 +0000

description:
genfs_do_getpages_xip_io_done: Adjust page condition checks:
- Expect uvn_findpage_xip() returns busy pages.
- Device pages are always initialized (== !uninitialized == !fake).

diffstat:

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

diffs (32 lines):

diff -r 25b7d371e9a3 -r 843fc2415809 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Sat Nov 20 08:00:53 2010 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Sat Nov 20 08:03:22 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfs_io.c,v 1.36.2.51 2010/11/20 07:47:34 uebayasi Exp $      */
+/*     $NetBSD: genfs_io.c,v 1.36.2.52 2010/11/20 08:03:22 uebayasi Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.51 2010/11/20 07:47:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.52 2010/11/20 08:03:22 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -1112,11 +1112,10 @@
                struct vm_page *pg = pps[i];
 
                KASSERT((pg->flags & PG_RDONLY) != 0);
-               KASSERT((pg->flags & PG_BUSY) == 0);
+               KASSERT((pg->flags & PG_BUSY) != 0);
                KASSERT((pg->flags & PG_CLEAN) != 0);
                KASSERT((pg->flags & PG_DEVICE) != 0);
-               pg->flags |= PG_BUSY;
-               pg->flags &= ~PG_FAKE;
+               KASSERT((pg->flags & PG_FAKE) == 0);
                pg->uobject = &vp->v_uobj;
        }