 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_vnops.c,v 1.54 2009/07/30 12:13:51 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.55 2009/09/14 21:10:44 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * 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.
 @@ -22,27 +22,27 @@
  * 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.
+ *
  * Generic parts are derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.54 2009/07/30 12:13:51 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.55 2009/09/14 21:10:44 reinoud Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 @@ -354,36 +354,34 @@ udf_write(void *v)
 		if (error)
 			break;
 		/* ubc, here we come, prepare to trap */
 		error = ubc_uiomove(uobj, uio, len, advice,
 		    UBC_WRITE | UBC_UNMAP_FLAG(vp));
 		if (error)
 			break;
 		/*
 		 * flush what we just wrote if necessary.
 		 * XXXUBC simplistic async flushing.
+		 *
-		 * this one works on page sizes. Directories are excluded
+		 * Directories are excluded since its file data that we want
-		 * since its file data that we want to purge.
+		 * to purge.
 		 */
 		if (!async && (vp->v_type != VDIR) &&
-		  (uio->uio_offset - old_offset >= PAGE_SIZE)) {
+		  (old_offset >> 16 != uio->uio_offset >> 16)) {
 			mutex_enter(&vp->v_interlock);
-			error = VOP_PUTPAGES(vp,
+			error = VOP_PUTPAGES(vp, (old_offset >> 16) << 16,
-				ptoa(atop(old_offset)),
+			    (uio->uio_offset >> 16) << 16, PGO_CLEANIT);
 				ptoa(atop(uio->uio_offset + PAGE_SIZE-1)),
 				PGO_CLEANIT);
 			old_offset = uio->uio_offset;
+		}
+	}
 	uvm_vnp_setsize(vp, file_size);
 	/* mark node changed and request update */
 	udf_node->i_flags |= IN_CHANGE | IN_UPDATE;
 	/*
 	 * XXX TODO FFS has code here to reset setuid & setgid when we're not
 	 * the superuser as a precaution against tampering.
 	 */
 @@ -1287,30 +1285,39 @@ udf_open(void *v)
 /* --------------------------------------------------------------------- */
 int
 udf_close(void *v)
+{
 	struct vop_close_args /* {
 		struct vnode *a_vp;
 		int a_fflag;
 		kauth_cred_t a_cred;
 		struct proc *a_p;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct udf_node *udf_node = VTOI(vp);
 	int async = vp->v_mount->mnt_flag & MNT_ASYNC;
 	int error;
 	DPRINTF(CALL, ("udf_close called\n"));
 	udf_node = udf_node;	/* shut up gcc */
 	if (!async && (vp->v_type != VDIR)) {
 		mutex_enter(&vp->v_interlock);
 		error = VOP_PUTPAGES(vp, 0, 0, PGO_CLEANIT);
 		if (error)
 			return error;
+	}
 	mutex_enter(&vp->v_interlock);
 		if (vp->v_usecount > 1)
 			udf_itimes(udf_node, NULL, NULL, NULL);
 	mutex_exit(&vp->v_interlock);
 	return 0;
+}
 /* --------------------------------------------------------------------- */
 static int
 udf_check_possible(struct vnode *vp, struct vattr *vap, mode_t mode)