 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.60 2021/07/18 23:56:13 dholland Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.61 2021/07/19 01:30:24 dholland 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.60 2021/07/18 23:56:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.61 2021/07/19 01:30:24 dholland 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>
 @@ -819,86 +819,71 @@ cd9660_setattr(void *v)
 	    || vap->va_mode != (mode_t)VNOVAL)
 		return EOPNOTSUPP;
 	if (vap->va_size != VNOVAL
 	    && vp->v_type != VCHR
 	    && vp->v_type != VBLK
 	    && vp->v_type != VFIFO)
 		return EOPNOTSUPP;
 	return 0;
+}
 /*
  * Global vfs data structures for isofs
  */
 #define	cd9660_create	genfs_eopnotsupp
 #define	cd9660_mknod	genfs_eopnotsupp
 #define	cd9660_write	genfs_eopnotsupp
 #define	cd9660_fsync	genfs_nullop
 #define	cd9660_remove	genfs_eopnotsupp
 #define	cd9660_rename	genfs_eopnotsupp
 #define	cd9660_mkdir	genfs_eopnotsupp
 #define	cd9660_rmdir	genfs_eopnotsupp
 #define	cd9660_advlock	genfs_einval
 #define	cd9660_bwrite	genfs_eopnotsupp
 #define cd9660_revoke	genfs_revoke
 /*
  * Global vfs data structures for cd9660
  */
 int (**cd9660_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_parsepath_desc, genfs_parsepath },	/* parsepath */
 	{ &vop_lookup_desc, cd9660_lookup },		/* lookup */
-	{ &vop_create_desc, cd9660_create },		/* create */
+	{ &vop_create_desc, genfs_eopnotsupp },		/* create */
-	{ &vop_mknod_desc, cd9660_mknod },		/* mknod */
+	{ &vop_mknod_desc, genfs_eopnotsupp },		/* mknod */
-	{ &vop_open_desc, cd9660_open },		/* open */
+	{ &vop_open_desc, genfs_nullop },		/* open */
-	{ &vop_close_desc, cd9660_close },		/* close */
+	{ &vop_close_desc, genfs_nullop },		/* close */
 	{ &vop_access_desc, cd9660_access },		/* access */
 	{ &vop_accessx_desc, genfs_accessx },		/* accessx */
 	{ &vop_getattr_desc, cd9660_getattr },		/* getattr */
 	{ &vop_setattr_desc, cd9660_setattr },		/* setattr */
 	{ &vop_read_desc, cd9660_read },		/* read */
-	{ &vop_write_desc, cd9660_write },		/* write */
+	{ &vop_write_desc, genfs_eopnotsupp },		/* write */
 	{ &vop_fallocate_desc, genfs_eopnotsupp },	/* fallocate */
 	{ &vop_fdiscard_desc, genfs_eopnotsupp },	/* fdiscard */
 	{ &vop_fcntl_desc, genfs_fcntl },		/* fcntl */
-	{ &vop_ioctl_desc, cd9660_ioctl },		/* ioctl */
+	{ &vop_ioctl_desc, genfs_enoioctl },		/* ioctl */
-	{ &vop_poll_desc, cd9660_poll },		/* poll */
+	{ &vop_poll_desc, genfs_poll },			/* poll */
-	{ &vop_revoke_desc, cd9660_revoke },		/* revoke */
+	{ &vop_revoke_desc, genfs_revoke },		/* revoke */
-	{ &vop_mmap_desc, cd9660_mmap },		/* mmap */
+	{ &vop_mmap_desc, genfs_mmap },			/* mmap */
-	{ &vop_fsync_desc, cd9660_fsync },		/* fsync */
+	{ &vop_fsync_desc, genfs_nullop },		/* fsync */
-	{ &vop_seek_desc, cd9660_seek },		/* seek */
+	{ &vop_seek_desc, genfs_seek },			/* seek */
-	{ &vop_remove_desc, cd9660_remove },		/* remove */
+	{ &vop_remove_desc, genfs_eopnotsupp },		/* remove */
 	{ &vop_link_desc, cd9660_link },		/* link */
-	{ &vop_rename_desc, cd9660_rename },		/* rename */
+	{ &vop_rename_desc, genfs_eopnotsupp },		/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },		/* mkdir */
+	{ &vop_mkdir_desc, genfs_eopnotsupp },		/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },		/* rmdir */
+	{ &vop_rmdir_desc, genfs_eopnotsupp },		/* rmdir */
 	{ &vop_symlink_desc, cd9660_symlink },		/* symlink */
 	{ &vop_readdir_desc, cd9660_readdir },		/* readdir */
 	{ &vop_readlink_desc, cd9660_readlink },	/* readlink */
-	{ &vop_abortop_desc, cd9660_abortop },		/* abortop */
+	{ &vop_abortop_desc, genfs_abortop },		/* abortop */
 	{ &vop_inactive_desc, cd9660_inactive },	/* inactive */
 	{ &vop_reclaim_desc, cd9660_reclaim },		/* reclaim */
 	{ &vop_lock_desc, genfs_lock },			/* lock */
 	{ &vop_unlock_desc, genfs_unlock },		/* unlock */
 	{ &vop_bmap_desc, cd9660_bmap },		/* bmap */
 	{ &vop_strategy_desc, cd9660_strategy },	/* strategy */
 	{ &vop_print_desc, cd9660_print },		/* print */
 	{ &vop_islocked_desc, genfs_islocked },		/* islocked */
 	{ &vop_pathconf_desc, cd9660_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, cd9660_advlock },		/* advlock */
+	{ &vop_advlock_desc, genfs_einval },		/* advlock */
 	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
 	{ &vop_getpages_desc, genfs_getpages },		/* getpages */
 	{ &vop_putpages_desc, genfs_putpages },		/* putpages */
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 	{ &cd9660_vnodeop_p, cd9660_vnodeop_entries };
 /*
  * Special device vnode ops
  */
 int (**cd9660_specop_p)(void *);
 const struct vnodeopv_entry_desc cd9660_specop_entries[] = {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: puffs_vnops.c,v 1.220 2021/07/18 23:56:13 dholland Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.221 2021/07/19 01:30:24 dholland 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.220 2021/07/18 23:56:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.221 2021/07/19 01:30:24 dholland 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, getticks() */
 #include <uvm/uvm.h>
 @@ -88,30 +88,26 @@ int	puffs_vnop_getpages(void *);
 int	puffs_vnop_abortop(void *);
 int	puffs_vnop_getextattr(void *);
 int	puffs_vnop_setextattr(void *);
 int	puffs_vnop_listextattr(void *);
 int	puffs_vnop_deleteextattr(void *);
 int	puffs_vnop_spec_read(void *);
 int	puffs_vnop_spec_write(void *);
 int	puffs_vnop_fifo_read(void *);
 int	puffs_vnop_fifo_write(void *);
 int	puffs_vnop_checkop(void *);
 #define puffs_vnop_lock genfs_lock
 #define puffs_vnop_unlock genfs_unlock
 #define puffs_vnop_islocked genfs_islocked
 int (**puffs_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc puffs_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_parsepath_desc, genfs_parsepath },	/* parsepath */
 	{ &vop_lookup_desc, puffs_vnop_lookup },	/* REAL lookup */
 	{ &vop_create_desc, puffs_vnop_checkop },	/* create */
         { &vop_mknod_desc, puffs_vnop_checkop },	/* mknod */
         { &vop_open_desc, puffs_vnop_open },		/* REAL open */
         { &vop_close_desc, puffs_vnop_checkop },	/* close */
         { &vop_access_desc, puffs_vnop_access },	/* REAL access */
         { &vop_accessx_desc, genfs_accessx },		/* accessx */
         { &vop_getattr_desc, puffs_vnop_checkop },	/* getattr */
         { &vop_setattr_desc, puffs_vnop_checkop },	/* setattr */
 @@ -128,31 +124,31 @@ const struct vnodeopv_entry_desc puffs_v
         { &vop_rmdir_desc, puffs_vnop_checkop },	/* rmdir */
         { &vop_symlink_desc, puffs_vnop_checkop },	/* symlink */
         { &vop_readdir_desc, puffs_vnop_checkop },	/* readdir */
         { &vop_readlink_desc, puffs_vnop_checkop },	/* readlink */
         { &vop_getpages_desc, puffs_vnop_checkop },	/* getpages */
         { &vop_putpages_desc, genfs_putpages },		/* REAL putpages */
         { &vop_pathconf_desc, puffs_vnop_checkop },	/* pathconf */
         { &vop_advlock_desc, puffs_vnop_advlock },	/* advlock */
         { &vop_strategy_desc, puffs_vnop_strategy },	/* REAL strategy */
         { &vop_revoke_desc, genfs_revoke },		/* REAL revoke */
         { &vop_abortop_desc, puffs_vnop_abortop },	/* REAL abortop */
         { &vop_inactive_desc, puffs_vnop_inactive },	/* REAL inactive */
         { &vop_reclaim_desc, puffs_vnop_reclaim },	/* REAL reclaim */
-        { &vop_lock_desc, puffs_vnop_lock },		/* REAL lock */
+        { &vop_lock_desc, genfs_lock },			/* REAL lock */
-        { &vop_unlock_desc, puffs_vnop_unlock },	/* REAL unlock */
+        { &vop_unlock_desc, genfs_unlock },		/* REAL unlock */
         { &vop_bmap_desc, puffs_vnop_bmap },		/* REAL bmap */
         { &vop_print_desc, puffs_vnop_print },		/* REAL print */
-        { &vop_islocked_desc, puffs_vnop_islocked },	/* REAL islocked */
+        { &vop_islocked_desc, genfs_islocked },		/* REAL islocked */
         { &vop_bwrite_desc, genfs_nullop },		/* REAL bwrite */
         { &vop_mmap_desc, puffs_vnop_mmap },		/* REAL mmap */
         { &vop_poll_desc, puffs_vnop_poll },		/* REAL poll */
 	{ &vop_getextattr_desc, puffs_vnop_getextattr },	/* getextattr */
 	{ &vop_setextattr_desc, puffs_vnop_setextattr },	/* setextattr */
 	{ &vop_listextattr_desc, puffs_vnop_listextattr },	/* listextattr */
 	{ &vop_deleteextattr_desc, puffs_vnop_deleteextattr },/* deleteextattr */
 #if 0
 	{ &vop_openextattr_desc, puffs_vnop_checkop },	/* openextattr */
 	{ &vop_closeextattr_desc, puffs_vnop_checkop },	/* closeextattr */
 #endif
         { &vop_kqfilter_desc, genfs_eopnotsupp },	/* kqfilter XXX */
 	{ NULL, NULL }
 @@ -166,30 +162,30 @@ const struct vnodeopv_entry_desc puffs_s
 	{ &vop_default_desc, vn_default_error },
 	GENFS_SPECOP_ENTRIES,
 	{ &vop_close_desc, spec_close },		/* spec_close */
 	{ &vop_access_desc, puffs_vnop_checkop },	/* access */
 	{ &vop_accessx_desc, genfs_accessx },		/* accessx */
 	{ &vop_getattr_desc, puffs_vnop_checkop },	/* getattr */
 	{ &vop_setattr_desc, puffs_vnop_checkop },	/* setattr */
 	{ &vop_read_desc, puffs_vnop_spec_read },	/* update, read */
 	{ &vop_write_desc, puffs_vnop_spec_write },	/* update, write */
 	{ &vop_fcntl_desc, genfs_fcntl },		/* dummy */
 	{ &vop_fsync_desc, spec_fsync },		/* vflushbuf */
 	{ &vop_inactive_desc, puffs_vnop_inactive },	/* REAL inactive */
 	{ &vop_reclaim_desc, puffs_vnop_reclaim },	/* REAL reclaim */
-	{ &vop_lock_desc, puffs_vnop_lock },		/* REAL lock */
+	{ &vop_lock_desc, genfs_lock },			/* REAL lock */
-	{ &vop_unlock_desc, puffs_vnop_unlock },	/* REAL unlock */
+	{ &vop_unlock_desc, genfs_unlock },		/* REAL unlock */
 	{ &vop_print_desc, puffs_vnop_print },		/* REAL print */
-	{ &vop_islocked_desc, puffs_vnop_islocked },	/* REAL islocked */
+	{ &vop_islocked_desc, genfs_islocked },		/* REAL islocked */
 	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
 	{ &vop_getextattr_desc, puffs_vnop_checkop },	/* getextattr */
 	{ &vop_setextattr_desc, puffs_vnop_checkop },	/* setextattr */
 	{ &vop_listextattr_desc, puffs_vnop_checkop },	/* listextattr */
 	{ &vop_deleteextattr_desc, puffs_vnop_checkop },/* deleteextattr */
 #if 0
 	{ &vop_openextattr_desc, _openextattr },	/* openextattr */
 	{ &vop_closeextattr_desc, _closeextattr },	/* closeextattr */
 #endif
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc puffs_specop_opv_desc =
 	{ &puffs_specop_p, puffs_specop_entries };
 @@ -200,31 +196,31 @@ const struct vnodeopv_entry_desc puffs_f
 	{ &vop_default_desc, vn_default_error },
 	GENFS_FIFOOP_ENTRIES,
 	{ &vop_close_desc, vn_fifo_bypass },		/* close */
 	{ &vop_access_desc, puffs_vnop_checkop },	/* access */
 	{ &vop_accessx_desc, genfs_accessx },		/* accessx */
 	{ &vop_getattr_desc, puffs_vnop_checkop },	/* getattr */
 	{ &vop_setattr_desc, puffs_vnop_checkop },	/* setattr */
 	{ &vop_read_desc, puffs_vnop_fifo_read },	/* read, update */
 	{ &vop_write_desc, puffs_vnop_fifo_write },	/* write, update */
 	{ &vop_fcntl_desc, genfs_fcntl },		/* dummy */
 	{ &vop_fsync_desc, vn_fifo_bypass },		/* genfs_nullop*/
 	{ &vop_inactive_desc, puffs_vnop_inactive },	/* REAL inactive */
 	{ &vop_reclaim_desc, puffs_vnop_reclaim },	/* REAL reclaim */
-	{ &vop_lock_desc, puffs_vnop_lock },		/* REAL lock */
+	{ &vop_lock_desc, genfs_lock },			/* REAL lock */
-	{ &vop_unlock_desc, puffs_vnop_unlock },	/* REAL unlock */
+	{ &vop_unlock_desc, genfs_unlock },		/* REAL unlock */
 	{ &vop_strategy_desc, vn_fifo_bypass },		/* genfs_badop */
 	{ &vop_print_desc, puffs_vnop_print },		/* REAL print */
-	{ &vop_islocked_desc, puffs_vnop_islocked },	/* REAL islocked */
+	{ &vop_islocked_desc, genfs_islocked },		/* REAL islocked */
 	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
 #if 0
 	{ &vop_openextattr_desc, _openextattr },	/* openextattr */
 	{ &vop_closeextattr_desc, _closeextattr },	/* closeextattr */
 #endif
 	{ &vop_getextattr_desc, puffs_vnop_checkop },		/* getextattr */
 	{ &vop_setextattr_desc, puffs_vnop_checkop },		/* setextattr */
 	{ &vop_listextattr_desc, puffs_vnop_checkop },	/* listextattr */
 	{ &vop_deleteextattr_desc, puffs_vnop_checkop },	/* deleteextattr */
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc puffs_fifoop_opv_desc =
 	{ &puffs_fifoop_p, puffs_fifoop_entries };
 @@ -245,27 +241,27 @@ const struct vnodeopv_entry_desc puffs_m
         { &vop_setattr_desc, puffs_vnop_setattr },	/* setattr */
         { &vop_read_desc, puffs_vnop_read },		/* read */
         { &vop_write_desc, puffs_vnop_write },		/* write */
         { &vop_seek_desc, puffs_vnop_seek },		/* seek */
         { &vop_remove_desc, puffs_vnop_remove },	/* remove */
         { &vop_link_desc, puffs_vnop_link },		/* link */
         { &vop_rename_desc, puffs_vnop_rename },	/* rename */
         { &vop_mkdir_desc, puffs_vnop_mkdir },		/* mkdir */
         { &vop_rmdir_desc, puffs_vnop_rmdir },		/* rmdir */
         { &vop_symlink_desc, puffs_vnop_symlink },	/* symlink */
         { &vop_readdir_desc, puffs_vnop_readdir },	/* readdir */
         { &vop_readlink_desc, puffs_vnop_readlink },	/* readlink */
         { &vop_print_desc, puffs_vnop_print },		/* print */
-        { &vop_islocked_desc, puffs_vnop_islocked },	/* islocked */
+        { &vop_islocked_desc, genfs_islocked },		/* islocked */
         { &vop_pathconf_desc, puffs_vnop_pathconf },	/* pathconf */
         { &vop_getpages_desc, puffs_vnop_getpages },	/* getpages */
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc puffs_msgop_opv_desc =
 	{ &puffs_msgop_p, puffs_msgop_entries };
 /*
  * for dosetattr / update_va
  */
 #define SETATTR_CHSIZE	0x01
 #define SETATTR_ASYNC	0x02

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_fifoops.c,v 1.14 2021/07/18 23:56:13 dholland Exp $	*/
+/*	$NetBSD: tmpfs_fifoops.c,v 1.15 2021/07/19 01:30:25 dholland Exp $	*/
 /*
  * Copyright (c) 2005 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,58 +25,58 @@
  * 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 for named pipes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_fifoops.c,v 1.14 2021/07/18 23:56:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_fifoops.c,v 1.15 2021/07/19 01:30:25 dholland Exp $");
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <fs/tmpfs/tmpfs.h>
 #include <fs/tmpfs/tmpfs_fifoops.h>
 /*
  * vnode operations vector used for fifos stored in a tmpfs file system.
  */
 int (**tmpfs_fifoop_p)(void *);
 const struct vnodeopv_entry_desc tmpfs_fifoop_entries[] = {
 	{ &vop_default_desc,		vn_default_error },
 	GENFS_FIFOOP_ENTRIES,
 	{ &vop_close_desc,		tmpfs_fifo_close },
-	{ &vop_access_desc,		tmpfs_fifo_access },
+	{ &vop_access_desc,		tmpfs_access },
 	{ &vop_accessx_desc,		genfs_accessx },
-	{ &vop_getattr_desc,		tmpfs_fifo_getattr },
+	{ &vop_getattr_desc,		tmpfs_getattr },
-	{ &vop_setattr_desc,		tmpfs_fifo_setattr },
+	{ &vop_setattr_desc,		tmpfs_setattr },
 	{ &vop_read_desc,		tmpfs_fifo_read },
 	{ &vop_write_desc,		tmpfs_fifo_write },
-	{ &vop_fcntl_desc,		tmpfs_fifo_fcntl },
+	{ &vop_fcntl_desc,		genfs_fcntl },
-	{ &vop_fsync_desc,		tmpfs_fifo_fsync },
+	{ &vop_fsync_desc,		vn_fifo_bypass },
-	{ &vop_inactive_desc,		tmpfs_fifo_inactive },
+	{ &vop_inactive_desc,		tmpfs_inactive },
-	{ &vop_reclaim_desc,		tmpfs_fifo_reclaim },
+	{ &vop_reclaim_desc,		tmpfs_reclaim },
-	{ &vop_lock_desc,		tmpfs_fifo_lock },
+	{ &vop_lock_desc,		genfs_lock },
-	{ &vop_unlock_desc,		tmpfs_fifo_unlock },
+	{ &vop_unlock_desc,		genfs_unlock },
-	{ &vop_strategy_desc,		tmpfs_fifo_strategy },
+	{ &vop_strategy_desc,		vn_fifo_bypass },
-	{ &vop_print_desc,		tmpfs_fifo_print },
+	{ &vop_print_desc,		tmpfs_print },
-	{ &vop_islocked_desc,		tmpfs_fifo_islocked },
+	{ &vop_islocked_desc,		genfs_islocked },
-	{ &vop_bwrite_desc,		tmpfs_fifo_bwrite },
+	{ &vop_bwrite_desc,		genfs_nullop },
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc tmpfs_fifoop_opv_desc = {
 	&tmpfs_fifoop_p, tmpfs_fifoop_entries
 };
 int
 tmpfs_fifo_close(void *v)
+{
 	struct vop_close_args /* {
 		struct vnode	*a_vp;
 		int		a_fflag;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_specops.c,v 1.15 2021/07/18 23:56:13 dholland Exp $	*/
+/*	$NetBSD: tmpfs_specops.c,v 1.16 2021/07/19 01:30:25 dholland Exp $	*/
 /*
  * Copyright (c) 2005 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,60 +25,60 @@
  * 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 for special devices.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_specops.c,v 1.15 2021/07/18 23:56:13 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_specops.c,v 1.16 2021/07/19 01:30:25 dholland Exp $");
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <fs/tmpfs/tmpfs.h>
 #include <fs/tmpfs/tmpfs_specops.h>
 /*
  * vnode operations vector used for special devices stored in a tmpfs
  * file system.
  */
 int (**tmpfs_specop_p)(void *);
 const struct vnodeopv_entry_desc tmpfs_specop_entries[] = {
 	{ &vop_default_desc,		vn_default_error },
 	GENFS_SPECOP_ENTRIES,
 	{ &vop_close_desc,		tmpfs_spec_close },
-	{ &vop_access_desc,		tmpfs_spec_access },
+	{ &vop_access_desc,		tmpfs_access },
 	{ &vop_accessx_desc,		genfs_accessx },
-	{ &vop_getattr_desc,		tmpfs_spec_getattr },
+	{ &vop_getattr_desc,		tmpfs_getattr },
-	{ &vop_setattr_desc,		tmpfs_spec_setattr },
+	{ &vop_setattr_desc,		tmpfs_setattr },
 	{ &vop_read_desc,		tmpfs_spec_read },
 	{ &vop_write_desc,		tmpfs_spec_write },
-	{ &vop_fcntl_desc,		tmpfs_spec_fcntl },
+	{ &vop_fcntl_desc,		genfs_fcntl },
-	{ &vop_fsync_desc,		tmpfs_spec_fsync },
+	{ &vop_fsync_desc,		spec_fsync },
-	{ &vop_inactive_desc,		tmpfs_spec_inactive },
+	{ &vop_inactive_desc,		tmpfs_inactive },
-	{ &vop_reclaim_desc,		tmpfs_spec_reclaim },
+	{ &vop_reclaim_desc,		tmpfs_reclaim },
-	{ &vop_lock_desc,		tmpfs_spec_lock },
+	{ &vop_lock_desc,		genfs_lock },
-	{ &vop_unlock_desc,		tmpfs_spec_unlock },
+	{ &vop_unlock_desc,		genfs_unlock },
-	{ &vop_print_desc,		tmpfs_spec_print },
+	{ &vop_print_desc,		tmpfs_print },
-	{ &vop_islocked_desc,		tmpfs_spec_islocked },
+	{ &vop_islocked_desc,		genfs_islocked },
-	{ &vop_bwrite_desc,		tmpfs_spec_bwrite },
+	{ &vop_bwrite_desc,		vn_bwrite },
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc tmpfs_specop_opv_desc = {
 	&tmpfs_specop_p, tmpfs_specop_entries
 };
 int
 tmpfs_spec_close(void *v)
+{
 	struct vop_close_args /* {
 		struct vnode	*a_vp;
 		int		a_fflag;