 @@ -1,14 +1,14 @@
-/*	$NetBSD: genfs_io.c,v 1.9 2009/03/23 11:48:33 pooka Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.10 2009/03/26 08:22:22 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code
  * and the Finnish Cultural Foundation.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR 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.9 2009/03/23 11:48:33 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.10 2009/03/26 08:22:22 pooka Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/lock.h>
 #include <sys/vnode.h>
 #include <miscfs/genfs/genfs_node.h>
 #include <miscfs/genfs/genfs.h>
 #include "rump_private.h"
 void
 @@ -366,39 +366,39 @@ genfs_do_putpages(struct vnode *vp, off_
 		curva = datap + (curoff-smallest);
 		memcpy(curva, (void *)pg->uanon, PAGE_SIZE);
 		rumpvm_enterva((vaddr_t)curva, pg);
 		pg->flags |= PG_CLEAN | PG_BUSY;
+	}
 	KASSERT(curoff > smallest);
 	mutex_exit(&uobj->vmobjlock);
 	mbp = getiobuf(vp, true);
 	mbp->b_bufsize = MAXPHYS;
 	mbp->b_data = datap;
-	mbp->b_resid = mbp->b_bcount = curoff-smallest;
+	mbp->b_resid = mbp->b_bcount = MIN(curoff,eof)-smallest;
 	mbp->b_cflags |= BC_BUSY;
 	mbp->b_flags = B_WRITE;
 	if (async) {
 		mbp->b_flags |= B_ASYNC;
 		mbp->b_iodone = rump_putiodone;
+	}
 	mutex_enter(&vp->v_interlock);
 	++vp->v_numoutput;
 	mutex_exit(&vp->v_interlock);
 	/* then we write */
-	for (bufoff = 0; bufoff < curoff-smallest; bufoff+=xfersize) {
+	for (bufoff = 0; bufoff < MIN(curoff,eof)-smallest; bufoff+=xfersize) {
 		struct vnode *devvp;
 		daddr_t bn, lbn;
 		size_t iotodo;
 		int run, error;
 		lbn = (smallest + bufoff) >> bshift;
 		error = VOP_BMAP(vp, lbn, &devvp, &bn, &run);
 		if (error)
 			panic("%s: VOP_BMAP lazy bum: %d", __func__, error);
 		xfersize = MIN(((lbn+1+run) << bshift) - (smallest+bufoff),
 		     curoff - (smallest+bufoff));
 @@ -409,32 +409,26 @@ genfs_do_putpages(struct vnode *vp, off_
 		 * enlarged the file.  So just ignore those ranges.
 		 */
 		if (bn == -1) {
 			skipbytes += xfersize;
 			continue;
+		}
 		/* only write max what we are allowed to write */
 		iotodo = xfersize;
 		if (smallest + bufoff + xfersize > eof)
 			iotodo -= (smallest+bufoff+xfersize) - eof;
 		iotodo = (iotodo + DEV_BSIZE-1) & ~(DEV_BSIZE-1);
 		/*
 		 * Compensate for potentially smaller write.  This will
 		 * be zero except near eof.
 		 */
 		skipbytes += xfersize - iotodo;
 		KASSERT(iotodo > 0);
 		KASSERT(smallest >= 0);
 		DPRINTF(("putpages writing from %x to %x (vp size %x)\n",
 		    (int)(smallest + bufoff),
 		    (int)(smallest + bufoff + iotodo),
 		    (int)eof));
 		bp = getiobuf(vp, true);
 		nestiobuf_setup(mbp, bp, bufoff, iotodo);
 		bp->b_lblkno = 0;
 		bp->b_blkno = bn + (((smallest+bufoff)&(bsize-1))>>DEV_BSHIFT);