[src/uebayasi-xip]: src/sys/miscfs/genfs Adjust XIP putpages to I/O XIP getpa...

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

details:   https://anonhg.NetBSD.org/src/rev/32dc2d66dd10
branches:  uebayasi-xip
changeset: 751867:32dc2d66dd10
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Nov 19 02:30:41 2010 +0000

description:
Adjust XIP putpages to I/O XIP getpages.

diffstat:

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

diffs (41 lines):

diff -r 13b1e7dbc0de -r 32dc2d66dd10 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Fri Nov 19 02:29:55 2010 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Fri Nov 19 02:30:41 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfs_io.c,v 1.36.2.35 2010/11/19 01:44:47 uebayasi Exp $      */
+/*     $NetBSD: genfs_io.c,v 1.36.2.36 2010/11/19 02:30:41 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.35 2010/11/19 01:44:47 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.36 2010/11/19 02:30:41 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -941,8 +941,7 @@
                pg->uobject = &vp->v_uobj;
        }
 
-       if ((flags & PGO_LOCKED) == 0)
-               mutex_exit(&uobj->vmobjlock);
+       mutex_exit(&uobj->vmobjlock);
 
        *npagesp = npages;
 
@@ -1547,10 +1546,10 @@
                orignpages = npages;
                KASSERT(mutex_owned(&uobj->vmobjlock));
                error = genfs_do_getpages_xip1(vp, off, pgs, &npages, 0,
-                   VM_PROT_ALL, 0, PGO_LOCKED);
+                   VM_PROT_ALL, 0, 0);
                KASSERT(error == 0);
                KASSERT(npages == orignpages);
-               KASSERT(mutex_owned(&uobj->vmobjlock));
+               mutex_enter(&uobj->vmobjlock);
                for (i = 0; i < npages; i++) {
                        pg = pgs[i];
                        if (pg == NULL || pg == PGO_DONTCARE)