 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_bio.c,v 1.66 2008/11/27 08:46:09 pooka Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.67 2009/08/04 23:31:57 pooka Exp $	*/
 /*
  * Copyright (c) 1998 Chuck Silvers.
  * 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.
 @@ -24,36 +24,37 @@
  * 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.
+ *
  */
 /*
  * uvm_bio.c: buffered i/o object mapping cache
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.66 2008/11/27 08:46:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.67 2009/08/04 23:31:57 pooka Exp $");
 #include "opt_uvmhist.h"
 #include "opt_ubc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <uvm/uvm.h>
 /*
  * global data structures
  */
 /*
  * local functions
  */
 static int	ubc_fault(struct uvm_faultinfo *, vaddr_t, struct vm_page **,
 			  int, int, vm_prot_t, int);
 @@ -686,13 +687,42 @@ ubc_uiomove(struct uvm_object *uobj, str
 			printf("%s: error=%d\n", __func__, error);
 			memset(win, 0, bytelen);
+		}
 		ubc_release(win, flags);
 		off += bytelen;
 		todo -= bytelen;
 		if (error != 0 && (flags & UBC_PARTIALOK) != 0) {
 			break;
+		}
+	}
 	return error;
+}
 /*
  * uvm_vnp_zerorange:  set a range of bytes in a file to zero.
  */
 void
 uvm_vnp_zerorange(struct vnode *vp, off_t off, size_t len)
+{
 	void *win;
 	int flags;
 	/*
 	 * XXXUBC invent kzero() and use it
 	 */
 	while (len) {
 		vsize_t bytelen = len;
 		win = ubc_alloc(&vp->v_uobj, off, &bytelen, UVM_ADV_NORMAL,
 		    UBC_WRITE);
 		memset(win, 0, bytelen);
 		flags = UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0;
 		ubc_release(win, flags);
 		off += bytelen;
 		len -= bytelen;
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_vnode.c,v 1.91 2009/08/04 23:03:01 pooka Exp $	*/
+/*	$NetBSD: uvm_vnode.c,v 1.92 2009/08/04 23:31:57 pooka Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993
  *      The Regents of the University of California.
  * Copyright (c) 1990 University of Utah.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
 @@ -40,27 +40,27 @@
  * 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.
+ *
  *      @(#)vnode_pager.c       8.8 (Berkeley) 2/13/94
  * from: Id: uvm_vnode.c,v 1.1.2.26 1998/02/02 20:38:07 chuck Exp
  */
 /*
  * uvm_vnode.c: the vnode pager.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.91 2009/08/04 23:03:01 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.92 2009/08/04 23:31:57 pooka Exp $");
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 @@ -362,54 +362,26 @@ void
 uvm_vnp_setwritesize(struct vnode *vp, voff_t newsize)
+{
 	mutex_enter(&vp->v_interlock);
 	KASSERT(newsize != VSIZENOTSET);
 	KASSERT(vp->v_size != VSIZENOTSET);
 	KASSERT(vp->v_writesize != VSIZENOTSET);
 	KASSERT(vp->v_size <= vp->v_writesize);
 	KASSERT(vp->v_size <= newsize);
 	vp->v_writesize = newsize;
 	mutex_exit(&vp->v_interlock);
+}
 /*
  * uvm_vnp_zerorange:  set a range of bytes in a file to zero.
  */
 void
 uvm_vnp_zerorange(struct vnode *vp, off_t off, size_t len)
 	void *win;
 	int flags;
 	/*
 	 * XXXUBC invent kzero() and use it
 	 */
 	while (len) {
 		vsize_t bytelen = len;
 		win = ubc_alloc(&vp->v_uobj, off, &bytelen, UVM_ADV_NORMAL,
 		    UBC_WRITE);
 		memset(win, 0, bytelen);
 		flags = UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0;
 		ubc_release(win, flags);
 		off += bytelen;
 		len -= bytelen;
 bool
 uvn_text_p(struct uvm_object *uobj)
+{
 	struct vnode *vp = (struct vnode *)uobj;
 	return (vp->v_iflag & VI_EXECMAP) != 0;
+}
 bool
 uvn_clean_p(struct uvm_object *uobj)
+{
 	struct vnode *vp = (struct vnode *)uobj;