 @@ -1,14 +1,14 @@
-/*	$NetBSD: genfs_io.c,v 1.36.2.39 2010/11/19 04:46:24 uebayasi Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.36.2.40 2010/11/19 05:22:29 uebayasi Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -21,27 +21,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.39 2010/11/19 04:46:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.40 2010/11/19 05:22:29 uebayasi Exp $");
 #include "opt_xip.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/poll.h>
 @@ -51,28 +51,26 @@ __KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v
 #include <sys/fstrans.h>
 #include <sys/buf.h>
 #include <sys/once.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/genfs/genfs_node.h>
 #include <miscfs/specfs/specdev.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pager.h>
 #ifdef XIP
 static int genfs_do_getpages_xip(void *);
 static int genfs_do_getpages_xip1(struct vnode *, voff_t, struct vm_page **,
     int *, int, vm_prot_t, int, int);
 static int genfs_do_getpages_xip_io(struct vnode *, voff_t, struct vm_page **,
     int *, int, vm_prot_t, int, int);
 static int genfs_do_putpages_xip(struct vnode *, off_t, off_t, int,
     struct vm_page **);
 #endif
 static int genfs_do_directio(struct vmspace *, vaddr_t, size_t, struct vnode *,
     off_t, enum uio_rw);
 static void genfs_dio_iodone(struct buf *);
 static int genfs_do_io(struct vnode *, off_t, vaddr_t, size_t, int, enum uio_rw,
     void (*)(struct buf *));
 static void genfs_rel_pages(struct vm_page **, int);
 static void genfs_markdirty(struct vnode *);
 @@ -814,64 +812,39 @@ genfs_do_getpages_xip(void *v)
 	struct vop_getpages_args /* {
 		struct vnode *a_vp;
 		voff_t a_offset;
 		struct vm_page **a_m;
 		int *a_count;
 		int a_centeridx;
 		vm_prot_t a_access_type;
 		int a_advice;
 		int a_flags;
 	} */ * const ap = v;
 	UVMHIST_FUNC("genfs_do_getpages_xip"); UVMHIST_CALLED(ubchist);
-	return genfs_do_getpages_xip1(
+	if ((ap->a_flags & PGO_LOCKED) != 0) {
-		ap->a_vp,
+		*ap->a_count = 0;
 		ap->a_offset,
 		ap->a_m,
 		ap->a_count,
 		ap->a_centeridx,
 		ap->a_access_type,
 		ap->a_advice,
 		ap->a_flags);
 static int
 genfs_do_getpages_xip1(
 	struct vnode *vp,
 	voff_t offset,
 	struct vm_page **pps,
 	int *npagesp,
 	int centeridx,
 	vm_prot_t access_type,
 	int advice,
 	int flags)
 	KASSERT((vp->v_vflag & VV_XIP) != 0);
 	if ((flags & PGO_LOCKED) != 0) {
 		*npagesp = 0;
 		return 0;
 	} else
 		return genfs_do_getpages_xip_io(
-			vp,
+			ap->a_vp,
-			offset,
+			ap->a_offset,
-			pps,
+			ap->a_m,
-			npagesp,
+			ap->a_count,
-			centeridx,
+			ap->a_centeridx,
-			access_type,
+			ap->a_access_type,
-			advice,
+			ap->a_advice,
-			flags);
+			ap->a_flags);
+}
 static int
 genfs_do_getpages_xip_io(
 	struct vnode *vp,
 	voff_t offset,
 	struct vm_page **pps,
 	int *npagesp,
 	int centeridx,
 	vm_prot_t access_type,
 	int advice,
 	int flags)
+{
 @@ -1520,49 +1493,49 @@ genfs_do_putpages_xip(struct vnode *vp,
 		goto done;
 	/*
 	 * For PGO_FREE (or (PGO_CLEANIT | PGO_FREE)), we invalidate MMU
 	 * mappings of both XIP pages and XIP zero pages.
+	 *
 	 * Zero page is freed when one of its mapped offset is freed, even if
 	 * one file (vnode) has many holes and mapping its zero page to all
 	 * of those hole pages.
+	 *
 	 * We don't know which pages are currently mapped in the given vnode,
 	 * because XIP pages are not added to vnode.  What we can do is to
 	 * locate pages by querying the filesystem as done in getpages.  Call
-	 * genfs_do_getpages_xip1().
+	 * genfs_do_getpages_xip_io().
 	 */
 	off_t off, eof;
 	off = trunc_page(startoff);
 	if (endoff == 0 || (flags & PGO_ALLPAGES))
 		GOP_SIZE(vp, vp->v_size, &eof, GOP_SIZE_MEM);
 	else
 		eof = endoff;
 	while (off < eof) {
 		int npages, orignpages, error, i;
 		struct vm_page *pgs[maxpages], *pg;
 		npages = round_page(eof - off) >> PAGE_SHIFT;
 		if (npages > maxpages)
 			npages = maxpages;
 		orignpages = npages;
 		KASSERT(mutex_owned(&uobj->vmobjlock));
 		mutex_exit(&uobj->vmobjlock);
-		error = genfs_do_getpages_xip1(vp, off, pgs, &npages, 0,
+		error = genfs_do_getpages_xip_io(vp, off, pgs, &npages, 0,
 		    VM_PROT_ALL, 0, 0);
 		KASSERT(error == 0);
 		KASSERT(npages == orignpages);
 		mutex_enter(&uobj->vmobjlock);
 		for (i = 0; i < npages; i++) {
 			pg = pgs[i];
 			if (pg == NULL || pg == PGO_DONTCARE)
 				continue;
 			/*
 			 * Freeing normal XIP pages; nothing to do.
 			 */
 			pmap_page_protect(pg, VM_PROT_NONE);
 			KASSERT((pg->flags & PG_BUSY) != 0);