 @@ -1,14 +1,14 @@
-/*	$NetBSD: genfs_io.c,v 1.28 2010/01/28 07:49:08 uebayasi Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.29 2010/01/28 08:02:12 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.28 2010/01/28 07:49:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.29 2010/01/28 08:02:12 uebayasi Exp $");
 #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>
 #include <sys/mman.h>
 #include <sys/file.h>
 @@ -97,27 +97,27 @@ genfs_getpages(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;
 	off_t diskeof, memeof;
 	off_t startoffset, endoffset;
-	int i, error, npages, orignpages, npgs, run, ridx;
+	int i, error, npages, npgs, run, ridx;
 	const int flags = ap->a_flags;
 	struct vnode * const vp = ap->a_vp;
 	struct genfs_node * const gp = VTOG(vp);
 	struct uvm_object * const uobj = &vp->v_uobj;
 	struct vm_page *pg, **pgs, *pgs_onstack[UBC_MAX_PAGES];
 	int pgs_size;
 	kauth_cred_t cred = curlwp->l_cred;		/* XXXUBC curlwp */
 	const bool async = (flags & PGO_SYNCIO) == 0;
 	const bool write = (ap->a_access_type & VM_PROT_WRITE) != 0;
 	bool has_trans = false;
 	const bool overwrite = (flags & PGO_OVERWRITE) != 0;
 	const bool blockalloc = write && (flags & PGO_NOBLOCKALLOC) == 0;
 	UVMHIST_FUNC("genfs_getpages"); UVMHIST_CALLED(ubchist);
 @@ -125,27 +125,27 @@ genfs_getpages(void *v)
 	UVMHIST_LOG(ubchist, "vp %p off 0x%x/%x count %d",
 	    vp, ap->a_offset >> 32, ap->a_offset, *ap->a_count);
 	KASSERT(vp->v_type == VREG || vp->v_type == VDIR ||
 	    vp->v_type == VLNK || vp->v_type == VBLK);
 	pgs = NULL;
 	pgs_size = 0;
 startover:
 	error = 0;
 	const voff_t origvsize = vp->v_size;
 	const off_t origoffset = ap->a_offset;
-	orignpages = *ap->a_count;
+	const int orignpages = *ap->a_count;
 	GOP_SIZE(vp, origvsize, &diskeof, 0);
 	if (flags & PGO_PASTEOF) {
 		off_t newsize;
 #if defined(DIAGNOSTIC)
 		off_t writeeof;
 #endif /* defined(DIAGNOSTIC) */
 		newsize = MAX(origvsize,
 		    origoffset + (orignpages << PAGE_SHIFT));
 		GOP_SIZE(vp, newsize, &memeof, GOP_SIZE_MEM);
 #if defined(DIAGNOSTIC)
 		GOP_SIZE(vp, vp->v_writesize, &writeeof, GOP_SIZE_MEM);
 		if (newsize > round_page(writeeof)) {
 @@ -245,29 +245,29 @@ startover:
 	mutex_exit(&uobj->vmobjlock);
 	/*
 	 * find the requested pages and make some simple checks.
 	 * leave space in the page array for a whole block.
 	 */
 	const int fs_bshift = (vp->v_type != VBLK) ?
 	    vp->v_mount->mnt_fs_bshift : DEV_BSHIFT;
 	const int dev_bshift = (vp->v_type != VBLK) ?
 	    vp->v_mount->mnt_dev_bshift : DEV_BSHIFT;
 	const int fs_bsize = 1 << fs_bshift;
-	orignpages = MIN(orignpages,
+	const int orignmempages = MIN(orignpages,
 	    round_page(memeof - origoffset) >> PAGE_SHIFT);
-	npages = orignpages;
+	npages = orignmempages;
 	startoffset = origoffset & ~(fs_bsize - 1);
 	endoffset = round_page((origoffset + (npages << PAGE_SHIFT) +
 	    fs_bsize - 1) & ~(fs_bsize - 1));
 	endoffset = MIN(endoffset, round_page(memeof));
 	ridx = (origoffset - startoffset) >> PAGE_SHIFT;
 	pgs_size = sizeof(struct vm_page *) *
 	    ((endoffset - startoffset) >> PAGE_SHIFT);
 	if (pgs_size > sizeof(pgs_onstack)) {
 		pgs = kmem_zalloc(pgs_size, async ? KM_NOSLEEP : KM_SLEEP);
 		if (pgs == NULL) {
 			pgs = pgs_onstack;
 			error = ENOMEM;
 @@ -297,30 +297,30 @@ startover:
 		rw_enter(&gp->g_glock, RW_WRITER);
 	} else {
 		rw_enter(&gp->g_glock, RW_READER);
+	}
 	mutex_enter(&uobj->vmobjlock);
 	if (vp->v_size < origvsize) {
 		genfs_node_unlock(vp);
 		if (pgs != pgs_onstack)
 			kmem_free(pgs, pgs_size);
 		goto startover;
+	}
 	if (uvn_findpages(uobj, origoffset, &npages, &pgs[ridx],
-	    async ? UFP_NOWAIT : UFP_ALL) != orignpages) {
+	    async ? UFP_NOWAIT : UFP_ALL) != orignmempages) {
 		genfs_node_unlock(vp);
 		KASSERT(async != 0);
-		genfs_rel_pages(&pgs[ridx], orignpages);
+		genfs_rel_pages(&pgs[ridx], orignmempages);
 		mutex_exit(&uobj->vmobjlock);
 		error = EBUSY;
 		goto out_err;
+	}
 	/*
 	 * if the pages are already resident, just return them.
 	 */
 	for (i = 0; i < npages; i++) {
 		struct vm_page *pg1 = pgs[ridx + i];
 		if ((pg1->flags & PG_FAKE) ||
 @@ -355,35 +355,35 @@ startover:
+    {
 	size_t bytes, iobytes, tailstart, tailbytes, totalbytes, skipbytes;
 	vaddr_t kva;
 	struct buf *bp, *mbp;
 	bool sawhole = false;
 	/*
 	 * the page wasn't resident and we're not overwriting,
 	 * so we're going to have to do some i/o.
 	 * find any additional pages needed to cover the expanded range.
 	 */
 	npages = (endoffset - startoffset) >> PAGE_SHIFT;
-	if (startoffset != origoffset || npages != orignpages) {
+	if (startoffset != origoffset || npages != orignmempages) {
 		/*
 		 * we need to avoid deadlocks caused by locking
 		 * additional pages at lower offsets than pages we
 		 * already have locked.  unlock them all and start over.
 		 */
-		genfs_rel_pages(&pgs[ridx], orignpages);
+		genfs_rel_pages(&pgs[ridx], orignmempages);
 		memset(pgs, 0, pgs_size);
 		UVMHIST_LOG(ubchist, "reset npages start 0x%x end 0x%x",
 		    startoffset, endoffset, 0,0);
 		npgs = npages;
 		if (uvn_findpages(uobj, startoffset, &npgs, pgs,
 		    async ? UFP_NOWAIT : UFP_ALL) != npages) {
 			genfs_node_unlock(vp);
 			KASSERT(async != 0);
 			genfs_rel_pages(pgs, npages);
 			mutex_exit(&uobj->vmobjlock);
 			error = EBUSY;
 			goto out_err;
 @@ -656,50 +656,50 @@ out:
 	mutex_enter(&uvm_pageqlock);
 	for (i = 0; i < npages; i++) {
 		pg = pgs[i];
 		if (pg == NULL) {
 			continue;
+		}
 		UVMHIST_LOG(ubchist, "examining pg %p flags 0x%x",
 		    pg, pg->flags, 0,0);
 		if (pg->flags & PG_FAKE && !overwrite) {
 			pg->flags &= ~(PG_FAKE);
 			pmap_clear_modify(pgs[i]);
+		}
 		KASSERT(!write || !blockalloc || (pg->flags & PG_RDONLY) == 0);
-		if (i < ridx || i >= ridx + orignpages || async) {
+		if (i < ridx || i >= ridx + orignmempages || async) {
 			UVMHIST_LOG(ubchist, "unbusy pg %p offset 0x%x",
 			    pg, pg->offset,0,0);
 			if (pg->flags & PG_WANTED) {
 				wakeup(pg);
+			}
 			if (pg->flags & PG_FAKE) {
 				KASSERT(overwrite);
 				uvm_pagezero(pg);
+			}
 			if (pg->flags & PG_RELEASED) {
 				uvm_pagefree(pg);
 				continue;
+			}
 			uvm_pageenqueue(pg);
 			pg->flags &= ~(PG_WANTED|PG_BUSY|PG_FAKE);
 			UVM_PAGE_OWN(pg, NULL);
+		}
+	}
 	mutex_exit(&uvm_pageqlock);
 	mutex_exit(&uobj->vmobjlock);
 	if (ap->a_m != NULL) {
 		memcpy(ap->a_m, &pgs[ridx],
-		    orignpages * sizeof(struct vm_page *));
+		    orignmempages * sizeof(struct vm_page *));
+	}
 out_err:
 	if (pgs != NULL && pgs != pgs_onstack)
 		kmem_free(pgs, pgs_size);
 	if (has_trans)
 		fstrans_done(vp->v_mount);
 	return (error);
+}
 /*
  * generic VM putpages routine.
  * Write the given range of pages to backing store.