 @@ -1,14 +1,14 @@
-/*	$NetBSD: advnops.c,v 1.52 2020/04/23 09:58:37 jdolecek Exp $	*/
+/*	$NetBSD: advnops.c,v 1.53 2020/04/23 21:47:07 ad Exp $	*/
 /*
  * Copyright (c) 1994 Christian E. Hopps
  * Copyright (c) 1996 Matthias Scheler
  * 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 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: advnops.c,v 1.52 2020/04/23 09:58:37 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.53 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/queue.h>
 #include <sys/namei.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>
 #include <sys/inttypes.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 @@ -260,27 +260,27 @@ adosfs_read(void *v)
 	if (vp->v_type == VREG && IS_FFS(amp)) {
 		const int advice = IO_ADV_DECODE(sp->a_ioflag);
 		error = 0;
 		while (uio->uio_resid > 0) {
 			vsize_t bytelen = MIN(ap->fsize - uio->uio_offset,
 					      uio->uio_resid);
 			if (bytelen == 0) {
 				break;
+			}
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error) {
 				break;
+			}
+		}
 		goto out;
+	}
 	do {
 		size = amp->dbsize;
 		lbn = uio->uio_offset / size;
 		on = uio->uio_offset % size;
 		n = MIN(size - on, uio->uio_resid);
 		diff = ap->fsize - uio->uio_offset;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.55 2019/07/12 17:18:30 maxv Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.56 2020/04/23 21:47:07 ad Exp $	*/
 /*-
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley
  * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
  * Support code is derived from software contributed to Berkeley
  * by Atsushi Murai (amurai@spec.co.jp).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * 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.
+ *
  *	@(#)cd9660_vnops.c	8.15 (Berkeley) 5/27/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.55 2019/07/12 17:18:30 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.56 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 @@ -231,27 +231,27 @@ cd9660_read(void *v)
 	imp = ip->i_mnt;
 	if (vp->v_type == VREG) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		error = 0;
 		while (uio->uio_resid > 0) {
 			vsize_t bytelen = MIN(ip->i_size - uio->uio_offset,
 					      uio->uio_resid);
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error)
 				break;
+		}
 		goto out;
+	}
 	do {
 		lbn = cd9660_lblkno(imp, uio->uio_offset);
 		on = cd9660_blkoff(imp, uio->uio_offset);
 		n = MIN(imp->logical_block_size - on, uio->uio_resid);
 		diff = (off_t)ip->i_size - uio->uio_offset;
 		if (diff <= 0)
 			return (0);

 @@ -1,33 +1,33 @@
-/*	$NetBSD: efs_vnops.c,v 1.38 2017/05/26 14:21:00 riastradh Exp $	*/
+/*	$NetBSD: efs_vnops.c,v 1.39 2020/04/23 21:47:07 ad Exp $	*/
 /*
  * Copyright (c) 2006 Stephen M. Rumble <rumble@ephemeral.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.38 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efs_vnops.c,v 1.39 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
 #include <sys/lockf.h>
 #include <sys/unistd.h>
 #include <sys/buf.h>
 @@ -268,27 +268,27 @@ efs_read(void *v)
 		if (!(uio->uio_offset >= start &&
 		      uio->uio_offset < (start + len))) {
 			ret = efs_extent_iterator_next(&exi, &ex);
 			continue;
+		}
 		start = uio->uio_offset - start;
 		len = MIN(len - start, uio->uio_resid);
 		len = MIN(len, eip->ei_size - uio->uio_offset);
 		err = ubc_uiomove(&ap->a_vp->v_uobj, uio, len, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(ap->a_vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(ap->a_vp));
 		if (err) {
 			EFS_DPRINTF(("efs_read: uiomove error %d\n",
 			    err));
 			return (err);
+		}
+	}
 	return ((ret == -1) ? 0 : ret);
+}
 static int
 efs_readdir(void *v)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: filecore_vnops.c,v 1.44 2015/04/20 23:03:08 riastradh Exp $	*/
+/*	$NetBSD: filecore_vnops.c,v 1.45 2020/04/23 21:47:07 ad Exp $	*/
 /*-
  * Copyright (c) 1994 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.
 @@ -56,27 +56,27 @@
  * 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.
+ *
  *	filecore_vnops.c	1.2	1998/8/18
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.44 2015/04/20 23:03:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.45 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 @@ -220,27 +220,27 @@ filecore_read(void *v)
 	if (vp->v_type == VREG) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		error = 0;
 		while (uio->uio_resid > 0) {
 			vsize_t bytelen = MIN(ip->i_size - uio->uio_offset,
 					      uio->uio_resid);
 			if (bytelen == 0) {
 				break;
+			}
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error) {
 				break;
+			}
+		}
 		goto out;
+	}
 	do {
 		lbn = filecore_lblkno(fcmp, uio->uio_offset);
 		on = filecore_blkoff(fcmp, uio->uio_offset);
 		n = MIN(filecore_blksize(fcmp, ip, lbn) - on, uio->uio_resid);
 		diff = (off_t)ip->i_size - uio->uio_offset;
 		if (diff <= 0)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hfs_vnops.c,v 1.34 2017/05/26 14:21:00 riastradh Exp $	*/
+/*	$NetBSD: hfs_vnops.c,v 1.35 2020/04/23 21:47:07 ad Exp $	*/
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Yevgeny Binder and Dieter Baron.
+ *
  * 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.
 @@ -91,27 +91,27 @@
  * 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.
  */
 /*
  * Apple HFS+ filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.34 2017/05/26 14:21:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hfs_vnops.c,v 1.35 2020/04/23 21:47:07 ad Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ipsec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/vmmeter.h>
 #include <sys/time.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 @@ -842,27 +842,27 @@ hfs_vop_read(void *v)
 	if (vp->v_type != VREG && vp->v_type != VLNK)
 		return EINVAL;
 	error = 0;
 	while (uio->uio_resid > 0 && error == 0) {
 		vsize_t len;
 		len = MIN(uio->uio_resid, fsize - uio->uio_offset);
 		if (len == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, len, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
+	}
 	return error;
+}
 int
 hfs_vop_readdir(void *v)
+{
 	struct vop_readdir_args /* {
 		struct vnode *a_vp;
 		struct uio *a_uio;
 		kauth_cred_t a_cred;
 		int *a_eofflag;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_denode.c,v 1.58 2020/04/13 19:23:17 ad Exp $	*/
+/*	$NetBSD: msdosfs_denode.c,v 1.59 2020/04/23 21:47:07 ad Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * 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
 @@ -38,27 +38,27 @@
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.58 2020/04/13 19:23:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.59 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>		/* defines "time" */
 #include <sys/dirent.h>
 #include <sys/namei.h>
 #include <sys/kauth.h>
 @@ -415,27 +415,27 @@ detrunc(struct denode *dep, u_long lengt
 				printf("detrunc(): bread fails %d\n", error);
 #endif
 				return (error);
+			}
 			memset((char *)bp->b_data + boff, 0,
 			    pmp->pm_bpcluster - boff);
 			if (flags & IO_SYNC)
 				bwrite(bp);
 			else
 				bdwrite(bp);
 		} else {
 			ubc_zerorange(&DETOV(dep)->v_uobj, length,
 				      pmp->pm_bpcluster - boff,
-				      UBC_UNMAP_FLAG(DETOV(dep)));
+				      UBC_VNODE_FLAGS(DETOV(dep)));
+		}
+	}
 	/*
 	 * Write out the updated directory entry.  Even if the update fails
 	 * we free the trailing clusters.
 	 */
 	dep->de_FileSize = length;
 	if (!isadir)
 		dep->de_flag |= DE_UPDATE|DE_MODIFIED;
 	vtruncbuf(DETOV(dep), lastblock + 1, 0, 0);
 	allerror = deupdat(dep, 1);
 #ifdef MSDOSFS_DEBUG
 @@ -513,27 +513,27 @@ deextend(struct denode *dep, u_long leng
+	}
 	/*
 	 * Zero extend file range; ubc_zerorange() uses ubc_alloc() and a
 	 * memset(); we set the write size so ubc won't read in file data that
 	 * is zero'd later.
 	 */
 	osize = dep->de_FileSize;
 	dep->de_FileSize = length;
 	uvm_vnp_setwritesize(DETOV(dep), (voff_t)dep->de_FileSize);
 	dep->de_flag |= DE_UPDATE|DE_MODIFIED;
 	ubc_zerorange(&DETOV(dep)->v_uobj, (off_t)osize,
 	    (size_t)(round_page(dep->de_FileSize) - osize),
-	    UBC_UNMAP_FLAG(DETOV(dep)));
+	    UBC_VNODE_FLAGS(DETOV(dep)));
 	uvm_vnp_setsize(DETOV(dep), (voff_t)dep->de_FileSize);
 	return (deupdat(dep, 1));
+}
 int
 msdosfs_reclaim(void *v)
+{
 	struct vop_reclaim_v2_args /* {
 		struct vnode *a_vp;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msdosfs_vnops.c,v 1.101 2020/04/13 19:23:17 ad Exp $	*/
+/*	$NetBSD: msdosfs_vnops.c,v 1.102 2020/04/23 21:47:07 ad Exp $	*/
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
  * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
  * All rights reserved.
  * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
+ *
  * 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
 @@ -38,27 +38,27 @@
  * it, and don't remove this notice.
+ *
  * This software is provided "as is".
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
+ *
  * October 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.101 2020/04/13 19:23:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.102 2020/04/23 21:47:07 ad Exp $");
 #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>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 @@ -470,27 +470,27 @@ msdosfs_read(void *v)
 	if (uio->uio_offset >= dep->de_FileSize)
 		return (0);
 	if (vp->v_type == VREG) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		while (uio->uio_resid > 0) {
 			bytelen = MIN(dep->de_FileSize - uio->uio_offset,
 				      uio->uio_resid);
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error)
 				break;
+		}
 		dep->de_flag |= DE_ACCESS;
 		goto out;
+	}
 	/* this loop is only for directories now */
 	do {
 		lbn = de_cluster(pmp, uio->uio_offset);
 		on = uio->uio_offset & pmp->pm_crbomask;
 		n = MIN(pmp->pm_bpcluster - on, uio->uio_resid);
 		if (uio->uio_offset >= dep->de_FileSize) {
 @@ -614,36 +614,36 @@ msdosfs_write(void *v)
 	if (uio->uio_offset + resid > osize) {
 		count = de_clcount(pmp, uio->uio_offset + resid) -
 			de_clcount(pmp, osize);
 		if ((error = extendfile(dep, count, NULL, NULL, 0)))
 			goto errexit;
 		dep->de_FileSize = uio->uio_offset + resid;
 		/* hint uvm to not read in extended part */
 		uvm_vnp_setwritesize(vp, dep->de_FileSize);
 		/* zero out the remainder of the last page */
 		rem = round_page(dep->de_FileSize) - dep->de_FileSize;
 		if (rem > 0)
 			ubc_zerorange(&vp->v_uobj, (off_t)dep->de_FileSize,
-			    rem, UBC_UNMAP_FLAG(vp));
+			    rem, UBC_VNODE_FLAGS(vp));
 		extended = 1;
+	}
 	do {
 		oldoff = uio->uio_offset;
 		bytelen = uio->uio_resid;
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
-		    IO_ADV_DECODE(ioflag), UBC_WRITE | UBC_UNMAP_FLAG(vp));
+		    IO_ADV_DECODE(ioflag), UBC_WRITE | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
 		/*
 		 * flush what we just wrote if necessary.
 		 * XXXUBC simplistic async flushing.
 		 */
 		if (!async && oldoff >> 16 != uio->uio_offset >> 16) {
 			rw_enter(vp->v_uobj.vmobjlock, RW_WRITER);
 			error = VOP_PUTPAGES(vp, (oldoff >> 16) << 16,
 			    (uio->uio_offset >> 16) << 16,
 			    PGO_CLEANIT | PGO_LAZY);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nilfs_vnops.c,v 1.39 2020/04/13 19:23:18 ad Exp $	*/
+/*	$NetBSD: nilfs_vnops.c,v 1.40 2020/04/23 21:47:07 ad Exp $	*/
 /*
  * Copyright (c) 2008, 2009 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.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.39 2020/04/13 19:23:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.40 2020/04/23 21:47:07 ad 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>
 @@ -169,27 +169,27 @@ nilfs_read(void *v)
 	error = 0;
 	while (uio->uio_resid > 0) {
 		/* reached end? */
 		if (file_size <= uio->uio_offset)
 			break;
 		/* maximise length to file extremity */
 		len = MIN(file_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0)
 			break;
 		/* ubc, here we come, prepare to trap */
 		error = ubc_uiomove(uobj, uio, len, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 	/* note access time unless not requested */
 	if (!(vp->v_mount->mnt_flag & MNT_NOATIME)) {
 		nilfs_node->i_flags |= IN_ACCESS;
 		if ((ioflag & IO_SYNC) == IO_SYNC)
 			error = nilfs_update(vp, NULL, NULL, NULL, UPDATE_WAIT);
+	}
 	return error;
+}
 @@ -259,27 +259,27 @@ nilfs_write(void *v)
 	uobj = &vp->v_uobj;
 	resid = uio->uio_resid;
 	error = 0;
 	uvm_vnp_setwritesize(vp, file_size);
 	while (uio->uio_resid > 0) {
 		/* maximise length to file extremity */
 		len = MIN(file_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0)
 			break;
 		/* ubc, here we come, prepare to trap */
 		error = ubc_uiomove(uobj, uio, len, advice,
-		    UBC_WRITE | UBC_UNMAP_FLAG(vp));
+		    UBC_WRITE | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 	uvm_vnp_setsize(vp, file_size);
 	/* mark node changed and request update */
 	nilfs_node->i_flags |= IN_CHANGE | IN_UPDATE;
 	if (vp->v_mount->mnt_flag & MNT_RELATIME)
 		nilfs_node->i_flags |= IN_ACCESS;
 	/*
 	 * XXX TODO FFS has code here to reset setuid & setgid when we're not
 	 * the superuser as a precaution against tampering.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_vnops.c,v 1.214 2020/02/23 15:46:40 ad Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.215 2020/04/23 21:47:07 ad Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Google Summer of Code program and the Ulla Tuominen Foundation.
  * The Google SoC project was mentored by Bill Studenmund.
+ *
  * 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.
 @@ -20,27 +20,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: puffs_vnops.c,v 1.214 2020/02/23 15:46:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.215 2020/04/23 21:47:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/kernel.h> /* For hz, hardclock_ticks */
 #include <uvm/uvm.h>
 @@ -1148,27 +1148,27 @@ puffs_vnop_getattr(void *v)
+}
 static void
 zerofill_lastpage(struct vnode *vp, voff_t off)
+{
 	if (trunc_page(off) == off)
 		return;
 	if (vp->v_writecount == 0)
 		return;
 	vsize_t len = round_page(off) - off;
-	ubc_zerorange(&vp->v_uobj, off, len, UBC_WRITE|UBC_UNMAP_FLAG(vp));
+	ubc_zerorange(&vp->v_uobj, off, len, UBC_WRITE|UBC_VNODE_FLAGS(vp));
+}
 static int
 dosetattr(struct vnode *vp, struct vattr *vap, kauth_cred_t cred, int flags)
+{
 	PUFFS_MSG_VARS(vn, setattr);
 	struct puffs_mount *pmp = MPTOPUFFSMP(vp->v_mount);
 	struct puffs_node *pn = vp->v_data;
 	vsize_t oldsize = vp->v_size;
 	int error = 0;
 	KASSERT(!(flags & SETATTR_CHSIZE) || mutex_owned(&pn->pn_sizemtx));
 @@ -2287,27 +2287,27 @@ puffs_vnop_read(void *v)
 	    (vp->v_size != 0)) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		while (uio->uio_resid > 0) {
 			if (vp->v_size <= uio->uio_offset) {
 				break;
+			}
 			bytelen = MIN(uio->uio_resid,
 			    vp->v_size - uio->uio_offset);
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error)
 				break;
+		}
 		if ((vp->v_mount->mnt_flag & MNT_NOATIME) == 0)
 			puffs_updatenode(VPTOPP(vp), PUFFS_UPDATEATIME, 0);
 	} else {
 		/*
 		 * in case it's not a regular file or we're operating
 		 * uncached, do read in the old-fashioned style,
 		 * i.e. explicit read operations
 		 */
 @@ -2397,27 +2397,27 @@ puffs_vnop_write(void *v)
 	/*
 	 * userspace *should* be allowed to control this,
 	 * but with UBC it's a bit unclear how to handle it
 	 */
 	if (ap->a_ioflag & IO_APPEND)
 		uio->uio_offset = vp->v_size;
 	origoff = uio->uio_offset;
 	if (vp->v_type == VREG &&
 	    PUFFS_USE_PAGECACHE(pmp) &&
 	    !(pn->pn_stat & PNODE_WDIRECT)) {
-		ubcflags = UBC_WRITE | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp);
+		ubcflags = UBC_WRITE | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp);
 		while (uio->uio_resid > 0) {
 			oldoff = uio->uio_offset;
 			bytelen = uio->uio_resid;
 			newoff = oldoff + bytelen;
 			if (vp->v_size < newoff) {
 				uvm_vnp_setwritesize(vp, newoff);
+			}
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
 			    UVM_ADV_RANDOM, ubcflags);
 			/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysvbfs_vnops.c,v 1.64 2020/01/17 20:08:08 ad Exp $	*/
+/*	$NetBSD: sysvbfs_vnops.c,v 1.65 2020/04/23 21:47:08 ad Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS 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 FOUNDATION 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: sysvbfs_vnops.c,v 1.64 2020/01/17 20:08:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.65 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/resource.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
 #include <sys/malloc.h>
 #include <sys/lockf.h>
 #include <sys/unistd.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/buf.h>
 @@ -438,27 +438,27 @@ sysvbfs_read(void *arg)
 		break;
 	case VDIR:
 		return EISDIR;
 	default:
 		return EINVAL;
+	}
 	err = 0;
 	while (uio->uio_resid > 0) {
 		if ((sz = MIN(filesz - uio->uio_offset, uio->uio_resid)) == 0)
 			break;
 		err = ubc_uiomove(&v->v_uobj, uio, sz, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(v));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(v));
 		if (err)
 			break;
 		DPRINTF("%s: read %ldbyte\n", __func__, sz);
+	}
 	uerr = sysvbfs_update(v, NULL, NULL, UPDATE_WAIT);
 	if (err == 0)
 		err = uerr;
 	return err;
+}
 int
 @@ -485,27 +485,27 @@ sysvbfs_write(void *arg)
 		uio->uio_offset = bnode->size;
 	if (uio->uio_resid == 0)
 		return 0;
 	if (bnode->size < uio->uio_offset + uio->uio_resid) {
 		sysvbfs_file_setsize(v, uio->uio_offset + uio->uio_resid);
 		extended = true;
+	}
 	while (uio->uio_resid > 0) {
 		sz = uio->uio_resid;
 		err = ubc_uiomove(&v->v_uobj, uio, sz, advice,
-		    UBC_WRITE | UBC_UNMAP_FLAG(v));
+		    UBC_WRITE | UBC_VNODE_FLAGS(v));
 		if (err)
 			break;
 		DPRINTF("%s: write %ldbyte\n", __func__, sz);
+	}
 	if (err)
 		sysvbfs_file_setsize(v, bnode->size - uio->uio_resid);
 	VN_KNOTE(v, NOTE_WRITE | (extended ? NOTE_EXTEND : 0));
 	return err;
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_subr.c,v 1.108 2020/04/04 20:49:30 ad Exp $	*/
+/*	$NetBSD: tmpfs_subr.c,v 1.109 2020/04/23 21:47:08 ad Exp $	*/
 /*
  * Copyright (c) 2005-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program, and by Mindaugas Rasiukevicius.
+ *
  * 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
 @@ -63,27 +63,27 @@
+ *
  *	If an inode has references within the file system (tn_links > 0) and
  *	its inactive vnode gets reclaimed/recycled - then the association is
  *	broken in tmpfs_reclaim().  In such case, an inode will always pass
  *	tmpfs_lookup() and thus vcache_get() to associate a new vnode.
+ *
  * Lock order
+ *
  *	vnode_t::v_vlock ->
  *		vnode_t::v_interlock
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.108 2020/04/04 20:49:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.109 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <sys/dirent.h>
 #include <sys/event.h>
 #include <sys/kmem.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 @@ -919,27 +919,27 @@ tmpfs_reg_resize(struct vnode *vp, off_t
 	if (newsize == oldsize) {
 		return 0;
+	}
 	if (newpages > oldpages) {
 		/* Increase the used-memory counter if getting extra pages. */
 		if (!tmpfs_mem_incr(tmp, (newpages - oldpages) << PAGE_SHIFT)) {
 			return ENOSPC;
+		}
 	} else if (newsize < oldsize) {
 		size_t zerolen;
 		zerolen = MIN(round_page(newsize), node->tn_size) - newsize;
-		ubc_zerorange(uobj, newsize, zerolen, UBC_UNMAP_FLAG(vp));
+		ubc_zerorange(uobj, newsize, zerolen, UBC_VNODE_FLAGS(vp));
+	}
 	node->tn_spec.tn_reg.tn_aobj_pages = newpages;
 	node->tn_size = newsize;
 	uvm_vnp_setsize(vp, newsize);
 	/*
 	 * Free "backing store".
 	 */
 	if (newpages < oldpages) {
 		rw_enter(uobj->vmobjlock, RW_WRITER);
 		uao_dropswap_range(uobj, newpages, oldpages);
 		rw_exit(uobj->vmobjlock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_vnops.c,v 1.135 2020/03/14 13:39:36 ad Exp $	*/
+/*	$NetBSD: tmpfs_vnops.c,v 1.136 2020/04/23 21:47:08 ad Exp $	*/
 /*
  * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  * 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
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * tmpfs vnode interface.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.135 2020/03/14 13:39:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.136 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/event.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <sys/lockf.h>
 #include <sys/kauth.h>
 @@ -536,27 +536,27 @@ tmpfs_read(void *v)
 	error = 0;
 	while (error == 0 && uio->uio_resid > 0) {
 		vsize_t len;
 		if (node->tn_size <= uio->uio_offset) {
 			break;
+		}
 		len = MIN(node->tn_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0) {
 			break;
+		}
 		error = ubc_uiomove(uobj, uio, len, IO_ADV_DECODE(ioflag),
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
+	}
 	tmpfs_update(vp, TMPFS_UPDATE_ATIME);
 	return error;
+}
 int
 tmpfs_write(void *v)
+{
 	struct vop_write_args /* {
 		struct vnode	*a_vp;
 		struct uio	*a_uio;
 		int		a_ioflag;
 @@ -598,27 +598,27 @@ tmpfs_write(void *v)
 			goto out;
+	}
 	uobj = node->tn_spec.tn_reg.tn_aobj;
 	error = 0;
 	while (error == 0 && uio->uio_resid > 0) {
 		vsize_t len;
 		len = MIN(node->tn_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0) {
 			break;
+		}
 		error = ubc_uiomove(uobj, uio, len, IO_ADV_DECODE(ioflag),
-		    UBC_WRITE | UBC_UNMAP_FLAG(vp));
+		    UBC_WRITE | UBC_VNODE_FLAGS(vp));
+	}
 	if (error) {
 		(void)tmpfs_reg_resize(vp, oldsize);
+	}
 	tmpfs_update(vp, TMPFS_UPDATE_MTIME | TMPFS_UPDATE_CTIME);
 	VN_KNOTE(vp, NOTE_WRITE);
 out:
 	if (error) {
 		KASSERT(oldsize == node->tn_size);
 	} else {
 		KASSERT(uio->uio_resid == 0);
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.41 2020/04/23 21:47:08 ad 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.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.41 2020/04/23 21:47:08 ad Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 /* TODO strip */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 @@ -2668,27 +2668,27 @@ udf_grow_node(struct udf_node *udf_node,
 				efe->obj_size = udf_rw64(objsize);
 				efe->l_ad     = udf_rw32(l_ad);
 				efe->tag.desc_crc_len = udf_rw16(crclen);
+			}
 			error = 0;
 			/* set new size for uvm */
 			uvm_vnp_setwritesize(vp, new_size);
 			uvm_vnp_setsize(vp, new_size);
 #if 0
 			/* zero append space in buffer */
 			ubc_zerorange(&vp->v_uobj, old_size,
-			    new_size - old_size, UBC_UNMAP_FLAG(vp));
+			    new_size - old_size, UBC_VNODE_FLAGS(vp));
 #endif
 			udf_node_sanity_check(udf_node, &new_inflen, &new_lbrec);
 			/* unlock */
 			UDF_UNLOCK_NODE(udf_node, 0);
 			KASSERT(new_inflen == orig_inflen + size_diff);
 			KASSERT(new_lbrec == orig_lbrec);
 			KASSERT(new_lbrec == 0);
 			return 0;
+		}
 @@ -2774,27 +2774,27 @@ udf_grow_node(struct udf_node *udf_node,
 	len   = udf_rw32(c_ad.len);
 	flags = UDF_EXT_FLAGS(len);
 	len   = UDF_EXT_LEN(len);
 	lastblock_grow = 0;
 	if (len % lb_size > 0) {
 		lastblock_grow = lb_size - (len % lb_size);
 		lastblock_grow = MIN(size_diff, lastblock_grow);
 		len += lastblock_grow;
 		c_ad.len = udf_rw32(len | flags);
 		/* TODO zero appened space in buffer! */
 		/* using ubc_zerorange(&vp->v_uobj, old_size, */
-		/*    new_size - old_size, UBC_UNMAP_FLAG(vp)); ? */
+		/*    new_size - old_size, UBC_VNODE_FLAGS(vp)); ? */
+	}
 	memset(&s_ad, 0, sizeof(struct long_ad));
 	/* size_diff can be bigger than allowed, so grow in chunks */
 	append_len = size_diff - lastblock_grow;
 	while (append_len > 0) {
 		chunk = MIN(append_len, max_len);
 		s_ad.len = udf_rw32(chunk | UDF_EXT_FREE);
 		s_ad.loc.part_num = udf_rw16(0);
 		s_ad.loc.lb_num   = udf_rw32(0);
 		if (udf_ads_merge(max_len, lb_size, &c_ad, &s_ad)) {
 			/* not mergable (anymore) */
 @@ -2945,27 +2945,27 @@ udf_shrink_node(struct udf_node *udf_nod
 			efe->inf_len  = udf_rw64(inflen);
 			efe->obj_size = udf_rw64(objsize);
 			efe->l_ad     = udf_rw32(l_ad);
 			efe->tag.desc_crc_len = udf_rw16(crclen);
+		}
 		error = 0;
 		/* clear the space in the descriptor */
 		KASSERT(old_size >= new_size);
 		memset(data_pos + new_size, 0, old_size - new_size);
 		/* TODO zero appened space in buffer! */
 		/* using ubc_zerorange(&vp->v_uobj, old_size, */
-		/*    old_size - new_size, UBC_UNMAP_FLAG(vp)); ? */
+		/*    old_size - new_size, UBC_VNODE_FLAGS(vp)); ? */
 		/* set new size for uvm */
 		uvm_vnp_setsize(vp, new_size);
 		udf_node_sanity_check(udf_node, &new_inflen, &new_lbrec);
 		UDF_UNLOCK_NODE(udf_node, 0);
 		KASSERT(new_inflen == orig_inflen - size_diff);
 		KASSERT(new_lbrec == orig_lbrec);
 		KASSERT(new_lbrec == 0);
 		return 0;
+	}

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_vnops.c,v 1.111 2020/04/14 11:45:42 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.112 2020/04/23 21:47:08 ad 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.111 2020/04/14 11:45:42 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.112 2020/04/23 21:47:08 ad 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>
 @@ -238,27 +238,27 @@ udf_read(void *v)
 	error = 0;
 	while (uio->uio_resid > 0) {
 		/* reached end? */
 		if (file_size <= uio->uio_offset)
 			break;
 		/* maximise length to file extremity */
 		len = MIN(file_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0)
 			break;
 		/* ubc, here we come, prepare to trap */
 		error = ubc_uiomove(uobj, uio, len, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 	/* note access time unless not requested */
 	if (!(vp->v_mount->mnt_flag & MNT_NOATIME)) {
 		udf_node->i_flags |= IN_ACCESS;
 		if ((ioflag & IO_SYNC) == IO_SYNC) {
 			int uerror;
 			uerror = udf_update(vp, NULL, NULL, NULL, UPDATE_WAIT);
 			if (error == 0)
 				error = uerror;
 @@ -356,27 +356,27 @@ udf_write(void *v)
 		/* maximise length to file extremity */
 		len = MIN(file_size - uio->uio_offset, uio->uio_resid);
 		if (len == 0)
 			break;
 		genfs_node_wrlock(vp);
 		error = GOP_ALLOC(vp, uio->uio_offset, len, aflag, cred);
 		genfs_node_unlock(vp);
 		if (error)
 			break;
 		/* ubc, here we come, prepare to trap */
 		error = ubc_uiomove(uobj, uio, len, advice,
-		    UBC_WRITE | UBC_UNMAP_FLAG(vp));
+		    UBC_WRITE | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
 		/*
 		 * flush what we just wrote if necessary.
 		 * XXXUBC simplistic async flushing.
+		 *
 		 * Directories are excluded since its file data that we want
 		 * to purge.
 		 */
 		if ((vp->v_type != VDIR) &&
 		  (old_offset >> 16 != uio->uio_offset >> 16)) {
 			rw_enter(vp->v_uobj.vmobjlock, RW_WRITER);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: v7fs_vnops.c,v 1.28 2020/04/13 19:23:18 ad Exp $	*/
+/*	$NetBSD: v7fs_vnops.c,v 1.29 2020/04/23 21:47:08 ad Exp $	*/
 /*-
  * Copyright (c) 2004, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS 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 FOUNDATION 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: v7fs_vnops.c,v 1.28 2020/04/13 19:23:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: v7fs_vnops.c,v 1.29 2020/04/23 21:47:08 ad Exp $");
 #if defined _KERNEL_OPT
 #include "opt_v7fs.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/resource.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
 #include <sys/kmem.h>
 #include <sys/lockf.h>
 #include <sys/unistd.h>
 @@ -582,27 +582,27 @@ v7fs_read(void *v)
 	struct v7fs_node *v7node = vp->v_data;
 	struct v7fs_inode *inode = &v7node->inode;
 	vsize_t sz, filesz = v7fs_inode_filesize(inode);
 	const int advice = IO_ADV_DECODE(a->a_ioflag);
 	int error = 0;
 	DPRINTF("type=%d inode=%d\n", vp->v_type, v7node->inode.inode_number);
 	while (uio->uio_resid > 0) {
 		if ((sz = MIN(filesz - uio->uio_offset, uio->uio_resid)) == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, sz, advice, UBC_READ |
-		    UBC_PARTIALOK | UBC_UNMAP_FLAG(v));
+		    UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error) {
 			break;
+		}
 		DPRINTF("read %zubyte\n", sz);
+	}
 	v7node->update_atime = true;
 	return error;
+}
 int
 v7fs_write(void *v)
+{
 @@ -634,27 +634,27 @@ v7fs_write(void *v)
 	/* If write region is over filesize, expand. */
 	size_t newsize= uio->uio_offset + uio->uio_resid;
 	ssize_t expand = newsize - sz;
  	if (expand > 0) {
 		if ((error = v7fs_datablock_expand(fs, inode, expand)))
 			return error;
 		uvm_vnp_setsize(vp, newsize);
+	}
 	while (uio->uio_resid > 0) {
 		sz = uio->uio_resid;
 		if ((error = ubc_uiomove(&vp->v_uobj, uio, sz, advice,
-			    UBC_WRITE | UBC_UNMAP_FLAG(v))))
+			    UBC_WRITE | UBC_VNODE_FLAGS(vp))))
 			break;
 		DPRINTF("write %zubyte\n", sz);
+	}
 	v7node->update_mtime = true;
 	return error;
+}
 int
 v7fs_fsync(void *v)
+{
 	struct vop_fsync_args /* {
 				 struct vnode *a_vp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nfs_bio.c,v 1.195 2020/03/22 18:32:42 ad Exp $	*/
+/*	$NetBSD: nfs_bio.c,v 1.196 2020/04/23 21:47:08 ad Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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.
+ *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.195 2020/03/22 18:32:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.196 2020/04/23 21:47:08 ad Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
 #include "opt_ddb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 @@ -148,27 +148,27 @@ nfs_bioread(struct vnode *vp, struct uio
 		advice = IO_ADV_DECODE(ioflag);
 		error = 0;
 		while (uio->uio_resid > 0) {
 			vsize_t bytelen;
 			nfs_delayedtruncate(vp);
 			if (np->n_size <= uio->uio_offset) {
 				break;
+			}
 			bytelen =
 			    MIN(np->n_size - uio->uio_offset, uio->uio_resid);
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			if (error) {
 				/*
 				 * XXXkludge
 				 * the file has been truncated on the server.
 				 * there isn't much we can do.
 				 */
 				if (uio->uio_offset >= np->n_size) {
 					/* end of file */
 					error = 0;
 				} else {
 					break;
+				}
+			}
 @@ -521,27 +521,27 @@ nfs_write(void *v)
 				bytelen = trunc_page(bytelen);
 				overwrite = true;
 			} else if ((bytelen & PAGE_MASK) == 0 &&
 			    uio->uio_offset >= vp->v_size) {
 				overwrite = true;
+			}
+		}
 		if (vp->v_size < uio->uio_offset + bytelen) {
 			uvm_vnp_setwritesize(vp, uio->uio_offset + bytelen);
+		}
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
 		    UVM_ADV_RANDOM, UBC_WRITE | UBC_PARTIALOK |
 		    (overwrite ? UBC_FAULTBUSY : 0) |
-		    UBC_UNMAP_FLAG(vp));
+		    UBC_VNODE_FLAGS(vp));
 		if (error) {
 			uvm_vnp_setwritesize(vp, vp->v_size);
 			if (overwrite && np->n_size != oldsize) {
 				/*
 				 * backout size and free pages past eof.
 				 */
 				np->n_size = oldsize;
 				rw_enter(vp->v_uobj.vmobjlock, RW_WRITER);
 				(void)VOP_PUTPAGES(vp, round_page(vp->v_size),
 , PGO_SYNCIO | PGO_FREE);
+			}
 			break;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpfs.c,v 1.156 2020/04/13 19:23:20 ad Exp $	*/
+/*	$NetBSD: rumpfs.c,v 1.157 2020/04/23 21:47:08 ad Exp $	*/
 /*
  * Copyright (c) 2009, 2010, 2011 Antti Kantee.  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.
+ *
 @@ -16,27 +16,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: rumpfs.c,v 1.156 2020/04/13 19:23:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.157 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/dirent.h>
 #include <sys/errno.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 @@ -1393,27 +1393,27 @@ rump_vop_read(void *v)
 	/* et op? */
 	if (rn->rn_flags & RUMPNODE_ET_PHONE_HOST)
 		return etread(rn, uio);
 	getnanotime(&ts);
 	(void)rumpfs_update(RUMPFS_ACCESS, vp, &ts, &ts, &ts);
 	/* otherwise, it's off to ubc with us */
 	while (uio->uio_resid > 0) {
 		chunk = MIN(uio->uio_resid, (off_t)rn->rn_dlen-uio->uio_offset);
 		if (chunk == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, chunk, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 	return error;
+}
 static int
 etwrite(struct rumpfs_node *rn, struct uio *uio)
+{
 	struct rumpuser_iovec iov;
 	uint8_t *buf;
 	size_t bufsize, n;
 @@ -1495,27 +1495,27 @@ rump_vop_write(void *v)
 		memset(rn->rn_data, 0, newlen);
 		if (oldlen > 0)
 			memcpy(rn->rn_data, olddata, oldlen);
 		allocd = true;
 		uvm_vnp_setsize(vp, newlen);
+	}
 	/* ok, we have enough stooorage.  write */
 	while (uio->uio_resid > 0) {
 		chunk = MIN(uio->uio_resid, (off_t)rn->rn_dlen-uio->uio_offset);
 		if (chunk == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, chunk, advice,
-		    UBC_WRITE | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_WRITE | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 	if (allocd) {
 		if (error) {
 			rump_hyperfree(rn->rn_data, newlen);
 			rn->rn_data = olddata;
 			rn->rn_dlen = oldlen;
 			uvm_vnp_setsize(vp, oldlen);
 		} else {
 			if ((rn->rn_flags & RUMPNODE_EXTSTORAGE) == 0) {
 				rump_hyperfree(olddata, oldlen);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chfs_subr.c,v 1.11 2019/12/31 13:07:13 ad Exp $	*/
+/*	$NetBSD: chfs_subr.c,v 1.12 2020/04/23 21:47:08 ad Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -222,27 +222,27 @@ chfs_chsize(struct vnode *vp, u_quad_t s
 	mutex_enter(&chmp->chm_lock_mountfields);
 	if (ip->size < size) {
 		uvm_vnp_setsize(vp, size);
 		chfs_set_vnode_size(vp, size);
 		ip->iflag |= IN_CHANGE | IN_UPDATE;
 		mutex_exit(&chmp->chm_lock_mountfields);
 		return 0;
+	}
 	if (size != 0) {
-		ubc_zerorange(&vp->v_uobj, size, ip->size - size, UBC_UNMAP_FLAG(vp));
+		ubc_zerorange(&vp->v_uobj, size, ip->size - size, UBC_VNODE_FLAGS(vp));
+	}
 	/* drop unused fragments */
 	chfs_truncate_fragtree(ip->chmp, &ip->fragtree, size);
 	uvm_vnp_setsize(vp, size);
 	chfs_set_vnode_size(vp, size);
 	ip->iflag |= IN_CHANGE | IN_UPDATE;
 	mutex_exit(&chmp->chm_lock_mountfields);
 	return 0;
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: chfs_vnops.c,v 1.37 2020/04/04 20:49:31 ad Exp $	*/
+/*	$NetBSD: chfs_vnops.c,v 1.38 2020/04/23 21:47:08 ad Exp $	*/
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
  *		      University of Szeged, Hungary
  * Copyright (C) 2010 Tamas Toth <ttoth@inf.u-szeged.hu>
  * Copyright (C) 2010 Adam Hoka <ahoka@NetBSD.org>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by the Department of Software Engineering, University of Szeged, Hungary
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -665,28 +665,27 @@ chfs_read(void *v)
 	bytelen = 0;
 	if (usepc) {
 		const int advice = IO_ADV_DECODE(ap->a_ioflag);
 		while (uio->uio_resid > 0) {
 			if (ioflag & IO_DIRECT) {
 				genfs_directio(vp, uio, ioflag);
+			}
 			bytelen = MIN(ip->size - uio->uio_offset,
 			    uio->uio_resid);
 			if (bytelen == 0)
 				break;
 			error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-			    UBC_READ | UBC_PARTIALOK |
+			    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 			    (UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0));
 			if (error)
 				break;
+		}
 		goto out;
+	}
 	dbg("start reading\n");
 	for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) {
 		bytesinfile = ip->size - uio->uio_offset;
 		if (bytesinfile <= 0)
 			break;
 		lbn = chfs_lblkno(chmp, uio->uio_offset);
 @@ -923,27 +922,27 @@ chfs_write(void *v)
 			genfs_node_wrlock(vp);
 			error = GOP_ALLOC(vp, uio->uio_offset, bytelen,
 			    aflag, cred);
 			genfs_node_unlock(vp);
 			if (error)
 				break;
 			ubc_flags |= UBC_FAULTBUSY;
+		}
 		/*
 		 * copy the data.
 		 */
-		ubc_flags |= UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0;
+		ubc_flags |= UBC_VNODE_FLAGS(vp);
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
 		    IO_ADV_DECODE(ioflag), ubc_flags);
 		/*
 		 * update UVM's notion of the size now that we've
 		 * copied the data into the vnode's pages.
+		 *
 		 * we should update the size even when uiomove failed.
 		 */
 		if (vp->v_size < newoff) {
 			uvm_vnp_setsize(vp, newoff);
 			extended = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs_inode.c,v 1.88 2017/05/26 14:34:20 riastradh Exp $	*/
+/*	$NetBSD: ext2fs_inode.c,v 1.89 2020/04/23 21:47:08 ad 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.
 @@ -50,27 +50,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  *	@(#)ffs_inode.c	8.8 (Berkeley) 10/19/94
  * Modified for ext2fs by Manuel Bouyer.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.88 2017/05/26 14:34:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.89 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/trace.h>
 #include <sys/resourcevar.h>
 #include <sys/kauth.h>
 @@ -350,27 +350,27 @@ ext2fs_truncate(struct vnode *ovp, off_t
 	/*
 	 * Shorten the size of the file. If the file is not being
 	 * truncated to a block boundry, the contents of the
 	 * partial block following the end of the file must be
 	 * zero'ed in case it ever become accessible again because
 	 * of subsequent file growth.
 	 */
 	offset = ext2_blkoff(fs, length);
 	if (offset != 0) {
 		size = fs->e2fs_bsize;
 		/* XXXUBC we should handle more than just VREG */
 		ubc_zerorange(&ovp->v_uobj, length, size - offset,
-		    UBC_UNMAP_FLAG(ovp));
+		    UBC_VNODE_FLAGS(ovp));
+	}
 	(void)ext2fs_setsize(oip, length);
 	uvm_vnp_setsize(ovp, length);
 	/*
 	 * Calculate index into inode's block list of
 	 * last direct and indirect blocks (if any)
 	 * which we want to keep.  Lastblock is -1 when
 	 * the file is truncated to 0.
 	 */
 	lastblock = ext2_lblkno(fs, length + fs->e2fs_bsize - 1) - 1;
 	lastiblock[SINGLE] = lastblock - EXT2FS_NDADDR;
 	lastiblock[DOUBLE] = lastiblock[SINGLE] - EXT2_NINDIR(fs);
 	lastiblock[TRIPLE] = lastiblock[DOUBLE] - EXT2_NINDIR(fs) * EXT2_NINDIR(fs);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ext2fs_readwrite.c,v 1.76 2020/02/23 15:46:42 ad Exp $	*/
+/*	$NetBSD: ext2fs_readwrite.c,v 1.77 2020/04/23 21:47:08 ad Exp $	*/
 /*-
  * Copyright (c) 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.
 @@ -50,27 +50,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  *	@(#)ufs_readwrite.c	8.8 (Berkeley) 8/4/94
  * Modified for ext2fs by Manuel Bouyer.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.76 2020/02/23 15:46:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.77 2020/04/23 21:47:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/kauth.h>
 @@ -125,27 +125,27 @@ ext2fs_read(void *v)
 		return 0;
 	if (uio->uio_offset >= ext2fs_size(ip))
 		goto out;
 	KASSERT(vp->v_type == VREG);
 	advice = IO_ADV_DECODE(ap->a_ioflag);
 	while (uio->uio_resid > 0) {
 		bytelen = MIN(ext2fs_size(ip) - uio->uio_offset,
 			    uio->uio_resid);
 		if (bytelen == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
 out:
 	error = ext2fs_post_read_update(vp, ap->a_ioflag, error);
 	return error;
+}
 /*
  * UFS op for reading via the buffer cache
  */
 int
 @@ -306,27 +306,27 @@ ext2fs_write(void *v)
 	while (uio->uio_resid > 0) {
 		oldoff = uio->uio_offset;
 		blkoffset = ext2_blkoff(fs, uio->uio_offset);
 		bytelen = MIN(fs->e2fs_bsize - blkoffset, uio->uio_resid);
 		if (vp->v_size < oldoff + bytelen) {
 			uvm_vnp_setwritesize(vp, oldoff + bytelen);
+		}
 		error = ufs_balloc_range(vp, uio->uio_offset, bytelen,
 		    ap->a_cred, 0);
 		if (error)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-		    UBC_WRITE | UBC_UNMAP_FLAG(vp));
+		    UBC_WRITE | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
 		/*
 		 * update UVM's notion of the size now that we've
 		 * copied the data into the vnode's pages.
 		 */
 		if (vp->v_size < uio->uio_offset) {
 			uvm_vnp_setsize(vp, uio->uio_offset);
 			extended = 1;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_inode.c,v 1.127 2020/04/18 19:18:34 christos Exp $	*/
+/*	$NetBSD: ffs_inode.c,v 1.128 2020/04/23 21:47:09 ad Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * 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.
 @@ -51,27 +51,27 @@
  * 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.
+ *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.127 2020/04/18 19:18:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.128 2020/04/23 21:47:09 ad Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/file.h>
 #include <sys/fstrans.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 @@ -354,27 +354,27 @@ ffs_truncate(struct vnode *ovp, off_t le
 		int size;
 		if (offset != 0) {
 			error = ufs_balloc_range(ovp, length - 1, 1, cred,
 			    aflag);
 			if (error)
 				return error;
+		}
 		lbn = ffs_lblkno(fs, length);
 		size = ffs_blksize(fs, oip, lbn);
 		eoz = MIN(MAX(ffs_lblktosize(fs, lbn) + size, round_page(pgoffset)),
 		    osize);
 		ubc_zerorange(&ovp->v_uobj, length, eoz - length,
-		    UBC_UNMAP_FLAG(ovp));
+		    UBC_VNODE_FLAGS(ovp));
 		if (round_page(eoz) > round_page(length)) {
 			rw_enter(ovp->v_uobj.vmobjlock, RW_WRITER);
 			error = VOP_PUTPAGES(ovp, round_page(length),
 			    round_page(eoz),
 			    PGO_CLEANIT | PGO_DEACTIVATE | PGO_JOURNALLOCKED |
 			    ((ioflag & IO_SYNC) ? PGO_SYNCIO : 0));
 			if (error)
 				return error;
+		}
+	}
 	genfs_node_wrlock(ovp);
 	oip->i_size = length;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_inode.c,v 1.159 2020/02/23 15:46:42 ad Exp $	*/
+/*	$NetBSD: lfs_inode.c,v 1.160 2020/04/23 21:47:09 ad Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * 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.
 @@ -50,27 +50,27 @@
  * 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.
+ *
  *	@(#)lfs_inode.c	8.9 (Berkeley) 5/8/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.159 2020/02/23 15:46:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.160 2020/04/23 21:47:09 ad Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 @@ -399,27 +399,27 @@ lfs_truncate(struct vnode *ovp, off_t le
 		voff_t eoz;
 		aflags = ioflag & IO_SYNC ? B_SYNC : 0;
 		error = ulfs_balloc_range(ovp, length - 1, 1, cred, aflags);
 		if (error) {
 			lfs_reserve(fs, ovp, NULL,
 				    -lfs_btofsb(fs, (2 * ULFS_NIADDR + 3) << lfs_sb_getbshift(fs)));
 			goto errout;
+		}
 		xlbn = lfs_lblkno(fs, length);
 		size = lfs_blksize(fs, oip, xlbn);
 		eoz = MIN(lfs_lblktosize(fs, xlbn) + size, osize);
 		ubc_zerorange(&ovp->v_uobj, length, eoz - length,
-		    UBC_UNMAP_FLAG(ovp));
+		    UBC_VNODE_FLAGS(ovp));
 		if (round_page(eoz) > round_page(length)) {
 			rw_enter(ovp->v_uobj.vmobjlock, RW_WRITER);
 			error = VOP_PUTPAGES(ovp, round_page(length),
 			    round_page(eoz),
 			    PGO_CLEANIT | PGO_DEACTIVATE |
 			    ((ioflag & IO_SYNC) ? PGO_SYNCIO : 0));
 			if (error) {
 				lfs_reserve(fs, ovp, NULL,
 					    -lfs_btofsb(fs, (2 * ULFS_NIADDR + 3) << lfs_sb_getbshift(fs)));
 				goto errout;
+			}
+		}
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ulfs_readwrite.c,v 1.26 2020/02/23 15:46:42 ad Exp $	*/
+/*	$NetBSD: ulfs_readwrite.c,v 1.27 2020/04/23 21:47:09 ad Exp $	*/
 /*  from NetBSD: ufs_readwrite.c,v 1.120 2015/04/12 22:48:38 riastradh Exp  */
 /*-
  * Copyright (c) 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
 @@ -23,27 +23,27 @@
  * 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.
+ *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.26 2020/02/23 15:46:42 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.27 2020/04/23 21:47:09 ad Exp $");
 #define	FS			struct lfs
 #define	I_FS			i_lfs
 #define	READ			lfs_read
 #define	READ_S			"lfs_read"
 #define	WRITE			lfs_write
 #define	WRITE_S			"lfs_write"
 #define	BUFRD			lfs_bufrd
 #define	BUFWR			lfs_bufwr
 #define	fs_sb_getbsize(fs)	lfs_sb_getbsize(fs)
 #define	fs_bmask		lfs_bmask
 static int	ulfs_post_read_update(struct vnode *, int, int);
 @@ -95,27 +95,27 @@ READ(void *v)
 	if (uio->uio_offset >= ip->i_size)
 		goto out;
 	KASSERT(vp->v_type == VREG);
 	advice = IO_ADV_DECODE(ap->a_ioflag);
 	while (uio->uio_resid > 0) {
 		if (ioflag & IO_DIRECT) {
 			genfs_directio(vp, uio, ioflag);
+		}
 		bytelen = MIN(ip->i_size - uio->uio_offset, uio->uio_resid);
 		if (bytelen == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
  out:
 	error = ulfs_post_read_update(vp, ap->a_ioflag, error);
 	return (error);
+}
 /*
  * UFS op for reading via the buffer cache
  */
 int
 @@ -363,27 +363,27 @@ WRITE(void *v)
 			error = GOP_ALLOC(vp, uio->uio_offset, bytelen,
 			    aflag, cred);
 			genfs_node_unlock(vp);
 			if (error)
 				break;
 			ubc_flags |= UBC_FAULTBUSY;
+		}
 		/*
 		 * copy the data.
 		 */
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
-		    IO_ADV_DECODE(ioflag), ubc_flags | UBC_UNMAP_FLAG(vp));
+		    IO_ADV_DECODE(ioflag), ubc_flags | UBC_VNODE_FLAGS(vp));
 		/*
 		 * update UVM's notion of the size now that we've
 		 * copied the data into the vnode's pages.
+		 *
 		 * we should update the size even when uiomove failed.
 		 */
 		if (vp->v_size < newoff) {
 			uvm_vnp_setsize(vp, newoff);
 			extended = 1;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ufs_readwrite.c,v 1.125 2020/02/23 15:46:43 ad Exp $	*/
+/*	$NetBSD: ufs_readwrite.c,v 1.126 2020/04/23 21:47:09 ad Exp $	*/
 /*-
  * Copyright (c) 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.
 @@ -22,27 +22,27 @@
  * 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.
+ *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.125 2020/02/23 15:46:43 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.126 2020/04/23 21:47:09 ad Exp $");
 #define	FS			struct fs
 #define	I_FS			i_fs
 #define	READ			ffs_read
 #define	READ_S			"ffs_read"
 #define	WRITE			ffs_write
 #define	WRITE_S			"ffs_write"
 #define	BUFRD			ffs_bufrd
 #define	BUFWR			ffs_bufwr
 #define ufs_blkoff		ffs_blkoff
 #define ufs_blksize		ffs_blksize
 #define ufs_lblkno		ffs_lblkno
 #define ufs_lblktosize		ffs_lblktosize
 @@ -96,27 +96,27 @@ READ(void *v)
 	if (uio->uio_offset >= ip->i_size)
 		goto out;
 	KASSERT(vp->v_type == VREG);
 	advice = IO_ADV_DECODE(ap->a_ioflag);
 	while (uio->uio_resid > 0) {
 		if (ioflag & IO_DIRECT) {
 			genfs_directio(vp, uio, ioflag);
+		}
 		bytelen = MIN(ip->i_size - uio->uio_offset, uio->uio_resid);
 		if (bytelen == 0)
 			break;
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen, advice,
-		    UBC_READ | UBC_PARTIALOK | UBC_UNMAP_FLAG(vp));
+		    UBC_READ | UBC_PARTIALOK | UBC_VNODE_FLAGS(vp));
 		if (error)
 			break;
+	}
  out:
 	error = ufs_post_read_update(vp, ap->a_ioflag, error);
 	return (error);
+}
 /*
  * UFS op for reading via the buffer cache
  */
 int
 @@ -398,27 +398,27 @@ WRITE(void *v)
 			error = GOP_ALLOC(vp, uio->uio_offset, bytelen,
 			    aflag, cred);
 			genfs_node_unlock(vp);
 			if (error)
 				break;
 			ubc_flags |= UBC_FAULTBUSY;
+		}
 		/*
 		 * copy the data.
 		 */
 		error = ubc_uiomove(&vp->v_uobj, uio, bytelen,
-		    IO_ADV_DECODE(ioflag), ubc_flags | UBC_UNMAP_FLAG(vp));
+		    IO_ADV_DECODE(ioflag), ubc_flags | UBC_VNODE_FLAGS(vp));
 		/*
 		 * update UVM's notion of the size now that we've
 		 * copied the data into the vnode's pages.
+		 *
 		 * we should update the size even when uiomove failed.
 		 */
 		if (vp->v_size < newoff) {
 			uvm_vnp_setsize(vp, newoff);
 			extended = 1;
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_bio.c,v 1.109 2020/04/23 21:12:06 ad Exp $	*/
+/*	$NetBSD: uvm_bio.c,v 1.110 2020/04/23 21:47:09 ad 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,27 +24,27 @@
  * 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.109 2020/04/23 21:12:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.110 2020/04/23 21:47:09 ad 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>
 @@ -724,45 +724,37 @@ ubc_release(void *va, int flags)
 int
 ubc_uiomove(struct uvm_object *uobj, struct uio *uio, vsize_t todo, int advice,
     int flags)
+{
 	const bool overwrite = (flags & UBC_FAULTBUSY) != 0;
 	voff_t off;
 	int error;
 	KASSERT(todo <= uio->uio_resid);
 	KASSERT(((flags & UBC_WRITE) != 0 && uio->uio_rw == UIO_WRITE) ||
 	    ((flags & UBC_READ) != 0 && uio->uio_rw == UIO_READ));
 #ifdef UBC_USE_PMAP_DIRECT
-	if (ubc_direct && UVM_OBJ_IS_VNODE(uobj)) {
+	/*
-		/*
+	 * during direct access pages need to be held busy to prevent them
-		 * during direct access pages need to be held busy to
+	 * changing identity, and therefore if we read or write an object
-		 * prevent them disappearing.  if the LWP reads or writes
+	 * into a mapped view of same we could deadlock while faulting.
 		 * a vnode into a mapped view of same it could deadlock.
-		 * prevent this by disallowing direct access if the vnode
+	 * avoid the problem by disallowing direct access if the object
-		 * is visible somewhere via mmap().
+	 * might be visible somewhere via mmap().
 	 */
 		 * the vnode flags are tested here, but at all points UBC is
 		 * called for vnodes, the vnode is locked (thus preventing a
 		 * new mapping via mmap() while busy here).
 		 */
-		struct vnode *vp = (struct vnode *)uobj;
+	if (ubc_direct && (flags & UBC_ISMAPPED) == 0) {
-		KASSERT(VOP_ISLOCKED(vp) != LK_NONE);
+		return ubc_uiomove_direct(uobj, uio, todo, advice, flags);
 		if ((vp->v_vflag & VV_MAPPED) == 0) {
 			return ubc_uiomove_direct(uobj, uio, todo, advice,
 			    flags);
+	}
 #endif
 	off = uio->uio_offset;
 	error = 0;
 	while (todo > 0) {
 		vsize_t bytelen = todo;
 		void *win;
 		win = ubc_alloc(uobj, off, &bytelen, advice, flags);
 		if (error == 0) {
 			error = uiomove(win, bytelen, uio);
+		}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_extern.h,v 1.223 2020/04/18 03:27:13 thorpej Exp $	*/
+/*	$NetBSD: uvm_extern.h,v 1.224 2020/04/23 21:47:09 ad Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * 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.
 @@ -216,26 +216,27 @@ b\32UNMAP\0\
  * flags for uvm_pagealloc_strat()
  */
 #define UVM_PGA_USERESERVE	0x0001	/* ok to use reserve pages */
 #define	UVM_PGA_ZERO		0x0002	/* returned page must be zero'd */
 /*
  * flags for ubc_uiomove()
  */
 #define UBC_READ	0x001	/* reading from object */
 #define UBC_WRITE	0x002	/* writing to object */
 #define UBC_FAULTBUSY	0x004	/* nobody else is using these pages, so busy
 				 * them at alloc and unbusy at release (e.g.,
 				 * for writes extending a file) */
 #define	UBC_ISMAPPED	0x008	/* object may be mapped by a process */
 /*
  * flags for ubc_release()
  */
 #define UBC_UNMAP	0x010	/* unmap pages now -- don't leave the
 				 * mappings cached indefinitely */
 /*
  * flags for ubc_uiomove()
  */
 #define	UBC_PARTIALOK	0x100	/* return early on error; otherwise, zero all
 				 * remaining bytes after error */
 @@ -539,31 +540,33 @@ extern bool vm_page_zero_enable;
 /*
  * Include the uvm_hotplug(9) API unconditionally until
  * uvm_page_physload() et. al. are obsoleted
+ *
  * After this, MD code will have to explicitly include it if needed.
  */
 #include <uvm/uvm_physseg.h>
 #endif
 /*
  * helpers for calling ubc_release()
  */
 #ifdef PMAP_CACHE_VIVT
-#define UBC_WANT_UNMAP(vp) (((vp)->v_iflag & VI_TEXT) != 0)
+#define UBC_VNODE_FLAGS(vp) \
     ((((vp)->v_iflag & VI_TEXT) != 0 ? UBC_UNMAP : 0) |
     (((vp)->v_vflag & VV_MAPPED) != 0 ? UBC_ISMAPPED : 0))
 #else
-#define UBC_WANT_UNMAP(vp) false
+#define UBC_VNODE_FLAGS(vp) \
     (((vp)->v_vflag & VV_MAPPED) != 0 ? UBC_ISMAPPED : 0)
 #endif
 #define UBC_UNMAP_FLAG(vp) (UBC_WANT_UNMAP(vp) ? UBC_UNMAP : 0)
 #if defined(_KERNEL) || defined(_KMEMUSER)
 /*
  * Shareable process virtual address space.
  * May eventually be merged with vm_map.
  * Several fields are temporary (text, data stuff).
  */
 struct vmspace {
 	struct	vm_map vm_map;	/* VM address map */
 	int	vm_refcnt;	/* number of references *
 				 * note: protected by vm_map.misc_lock */
 	void *	vm_shm;		/* SYS5 shared memory private data XXX */
 /* we copy from vm_startcopy to the end of the structure on fork */