 @@ -71,26 +71,27 @@
 #include <sys/buf.h>
 #include <sys/sched.h>
 #include <sys/acl.h>
 #include <sys/extdirent.h>
 #ifdef __FreeBSD__
 #include <sys/kidmap.h>
 #include <sys/bio.h>
 #include <vm/vm_param.h>
 #endif
 #ifdef __NetBSD__
 #include <dev/mm.h>
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/genfs/genfs_node.h>
 #include <uvm/uvm_extern.h>
 #include <sys/fstrans.h>
 #include <sys/malloc.h>
 uint_t zfs_putpage_key;
 #endif
 /*
  * Programming rules.
+ *
  * Each vnode op performs some logical unit of work.  To do this, the ZPL must
 @@ -5062,36 +5063,59 @@ static int
 zfs_netbsd_ioctl(void *v)
+{
 	struct vop_ioctl_args *ap = v;
 	return (zfs_ioctl(ap->a_vp, ap->a_command, (intptr_t)ap->a_data,
 		ap->a_fflag, ap->a_cred, NULL, NULL));
+}
 static int
 zfs_netbsd_read(void *v)
+{
 	struct vop_read_args *ap = v;
 	vnode_t *vp = ap->a_vp;
 	znode_t *zp = VTOZ(vp);
-	return (zfs_read(ap->a_vp, ap->a_uio, ioflags(ap->a_ioflag), ap->a_cred, NULL));
+	switch (vp->v_type) {
 	case VBLK:
 	case VCHR:
 		ZFS_ACCESSTIME_STAMP(zp->z_zfsvfs, zp);
 		return (VOCALL(spec_vnodeop_p, VOFFSET(vop_read), ap));
 	case VFIFO:
 		ZFS_ACCESSTIME_STAMP(zp->z_zfsvfs, zp);
 		return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_read), ap));
+	}
 	return (zfs_read(vp, ap->a_uio, ioflags(ap->a_ioflag), ap->a_cred, NULL));
+}
 static int
 zfs_netbsd_write(void *v)
+{
 	struct vop_write_args *ap = v;
 	vnode_t *vp = ap->a_vp;
-	return (zfs_write(ap->a_vp, ap->a_uio, ioflags(ap->a_ioflag), ap->a_cred, NULL));
+	switch (vp->v_type) {
 	case VBLK:
 	case VCHR:
 		GOP_MARKUPDATE(vp, GOP_UPDATE_MODIFIED);
 		return (VOCALL(spec_vnodeop_p, VOFFSET(vop_write), ap));
 	case VFIFO:
 		GOP_MARKUPDATE(vp, GOP_UPDATE_MODIFIED);
 		return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_write), ap));
+	}
 	return (zfs_write(vp, ap->a_uio, ioflags(ap->a_ioflag), ap->a_cred, NULL));
+}
 static int
 zfs_netbsd_access(void *v)
+{
 	struct vop_access_args /* {
 		struct vnode *a_vp;
 		int a_mode;
 		kauth_cred_t a_cred;
 	} */ *ap = v;
 	struct vnode *vp = ap->a_vp;
 	int mode = ap->a_mode;
 	mode_t zfs_mode = 0;
 @@ -5268,26 +5292,64 @@ zfs_netbsd_create(void *v)
 	/* XXX !EXCL is wrong here...  */
 	error = zfs_create(dvp, nm, vap, !EXCL, mode, vpp, cnp->cn_cred, NULL);
 	PNBUF_PUT(nm);
 	KASSERT((error == 0) == (*vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
 	VOP_UNLOCK(*vpp, 0);
 	return (error);
+}
 static int
 zfs_netbsd_mknod(void *v)
+{
 	struct vop_mknod_v3_args /* {
 		struct vnode *a_dvp;
 		struct vnode **a_vpp;
 		struct componentname *a_cnp;
 		struct vattr *a_vap;
 	} */ *ap = v;
 	struct vnode *dvp = ap->a_dvp;
 	struct vnode **vpp = ap->a_vpp;
 	struct componentname *cnp = ap->a_cnp;
 	struct vattr *vap = ap->a_vap;
 	char *nm;
 	int mode;
 	int error;
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
 	vattr_init_mask(vap);
 	mode = vap->va_mode & ALLPERMS;
 	/* ZFS wants a null-terminated name. */
 	nm = PNBUF_GET();
 	(void)strlcpy(nm, cnp->cn_nameptr, cnp->cn_namelen + 1);
 	/* XXX !EXCL is wrong here...  */
 	error = zfs_create(dvp, nm, vap, !EXCL, mode, vpp, cnp->cn_cred, NULL);
 	PNBUF_PUT(nm);
 	KASSERT((error == 0) == (*vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
 	VOP_UNLOCK(*vpp, 0);
 	return (error);
+}
 static int
 zfs_netbsd_remove(void *v)
+{
 	struct vop_remove_v2_args /* {
 		struct vnode *a_dvp;
 		struct vnode *a_vp;
 		struct componentname *a_cnp;
 	} */ *ap = v;
 	struct vnode *dvp = ap->a_dvp;
 	struct vnode *vp = ap->a_vp;
 	struct componentname *cnp = ap->a_cnp;
 	char *nm;
 	int error;
 @@ -6139,26 +6201,27 @@ const struct genfs_ops zfs_genfsops = {
 #define	zfs_netbsd_lock		genfs_lock
 #define	zfs_netbsd_unlock	genfs_unlock
 #define	zfs_netbsd_islocked	genfs_islocked
 #define zfs_netbsd_seek		genfs_seek
 #define zfs_netbsd_mmap		genfs_mmap
 #define zfs_netbsd_fcntl	genfs_fcntl
 int (**zfs_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc zfs_vnodeop_entries[] = {
 	{ &vop_default_desc,		vn_default_error },
 	{ &vop_lookup_desc,		zfs_netbsd_lookup },
 	{ &vop_create_desc,		zfs_netbsd_create },
 	{ &vop_mknod_desc,		zfs_netbsd_mknod },
 	{ &vop_open_desc,		zfs_netbsd_open },
 	{ &vop_close_desc,		zfs_netbsd_close },
 	{ &vop_access_desc,		zfs_netbsd_access },
 	{ &vop_getattr_desc,		zfs_netbsd_getattr },
 	{ &vop_setattr_desc,		zfs_netbsd_setattr },
 	{ &vop_read_desc,		zfs_netbsd_read },
 	{ &vop_write_desc,		zfs_netbsd_write },
 	{ &vop_ioctl_desc,		zfs_netbsd_ioctl },
 	{ &vop_fsync_desc,		zfs_netbsd_fsync },
 	{ &vop_remove_desc,		zfs_netbsd_remove },
 	{ &vop_link_desc,		zfs_netbsd_link },
 	{ &vop_lock_desc,		zfs_netbsd_lock },
 	{ &vop_unlock_desc,		zfs_netbsd_unlock },
 @@ -6175,14 +6238,97 @@ const struct vnodeopv_entry_desc zfs_vno
 	{ &vop_getpages_desc,		zfs_netbsd_getpages },
 	{ &vop_putpages_desc,		zfs_netbsd_putpages },
 	{ &vop_mmap_desc,		zfs_netbsd_mmap },
 	{ &vop_islocked_desc,		zfs_netbsd_islocked },
 	{ &vop_advlock_desc,		zfs_netbsd_advlock },
 	{ &vop_print_desc,		zfs_netbsd_print },
 	{ &vop_fcntl_desc,		zfs_netbsd_fcntl },
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc zfs_vnodeop_opv_desc =
 	{ &zfs_vnodeop_p, zfs_vnodeop_entries };
 int (**zfs_specop_p)(void *);
 const struct vnodeopv_entry_desc zfs_specop_entries[] = {
 	{ &vop_default_desc,		vn_default_error },
 	{ &vop_lookup_desc,		spec_lookup },
 	{ &vop_create_desc,		spec_create },
 	{ &vop_mknod_desc,		spec_mknod },
 	{ &vop_open_desc,		spec_open },
 	{ &vop_close_desc,		spec_close },
 	{ &vop_access_desc,		zfs_netbsd_access },
 	{ &vop_getattr_desc,		zfs_netbsd_getattr },
 	{ &vop_setattr_desc,		zfs_netbsd_setattr },
 	{ &vop_read_desc,		/**/zfs_netbsd_read },
 	{ &vop_write_desc,		/**/zfs_netbsd_write },
 	{ &vop_ioctl_desc,		spec_ioctl },
 	{ &vop_fsync_desc,		zfs_netbsd_fsync },
 	{ &vop_remove_desc,		spec_remove },
 	{ &vop_link_desc,		spec_link },
 	{ &vop_lock_desc,		zfs_netbsd_lock },
 	{ &vop_unlock_desc,		zfs_netbsd_unlock },
 	{ &vop_rename_desc,		spec_rename },
 	{ &vop_mkdir_desc,		spec_mkdir },
 	{ &vop_rmdir_desc,		spec_rmdir },
 	{ &vop_symlink_desc,		spec_symlink },
 	{ &vop_readdir_desc,		spec_readdir },
 	{ &vop_readlink_desc,		spec_readlink },
 	{ &vop_inactive_desc,		zfs_netbsd_inactive },
 	{ &vop_reclaim_desc,		zfs_netbsd_reclaim },
 	{ &vop_pathconf_desc,		spec_pathconf },
 	{ &vop_seek_desc,		spec_seek },
 	{ &vop_getpages_desc,		spec_getpages },
 	{ &vop_putpages_desc,		spec_putpages },
 	{ &vop_mmap_desc,		spec_mmap },
 	{ &vop_islocked_desc,		zfs_netbsd_islocked },
 	{ &vop_advlock_desc,		spec_advlock },
 	{ &vop_print_desc,		zfs_netbsd_print },
 	{ &vop_fcntl_desc,		zfs_netbsd_fcntl },
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc zfs_specop_opv_desc =
 	{ &zfs_specop_p, zfs_specop_entries };
 int (**zfs_fifoop_p)(void *);
 const struct vnodeopv_entry_desc zfs_fifoop_entries[] = {
 	{ &vop_default_desc,		vn_default_error },
 	{ &vop_lookup_desc,		vn_fifo_bypass },
 	{ &vop_create_desc,		vn_fifo_bypass },
 	{ &vop_mknod_desc,		vn_fifo_bypass },
 	{ &vop_open_desc,		vn_fifo_bypass },
 	{ &vop_close_desc,		vn_fifo_bypass },
 	{ &vop_access_desc,		zfs_netbsd_access },
 	{ &vop_getattr_desc,		zfs_netbsd_getattr },
 	{ &vop_setattr_desc,		zfs_netbsd_setattr },
 	{ &vop_read_desc,		/**/zfs_netbsd_read },
 	{ &vop_write_desc,		/**/zfs_netbsd_write },
 	{ &vop_ioctl_desc,		vn_fifo_bypass },
 	{ &vop_fsync_desc,		zfs_netbsd_fsync },
 	{ &vop_remove_desc,		vn_fifo_bypass },
 	{ &vop_link_desc,		vn_fifo_bypass },
 	{ &vop_lock_desc,		zfs_netbsd_lock },
 	{ &vop_unlock_desc,		zfs_netbsd_unlock },
 	{ &vop_rename_desc,		vn_fifo_bypass },
 	{ &vop_mkdir_desc,		vn_fifo_bypass },
 	{ &vop_rmdir_desc,		vn_fifo_bypass },
 	{ &vop_symlink_desc,		vn_fifo_bypass },
 	{ &vop_readdir_desc,		vn_fifo_bypass },
 	{ &vop_readlink_desc,		vn_fifo_bypass },
 	{ &vop_inactive_desc,		zfs_netbsd_inactive },
 	{ &vop_reclaim_desc,		zfs_netbsd_reclaim },
 	{ &vop_pathconf_desc,		vn_fifo_bypass },
 	{ &vop_seek_desc,		vn_fifo_bypass },
 	{ &vop_putpages_desc,		vn_fifo_bypass },
 	{ &vop_mmap_desc,		vn_fifo_bypass },
 	{ &vop_islocked_desc,		zfs_netbsd_islocked },
 	{ &vop_advlock_desc,		vn_fifo_bypass },
 	{ &vop_print_desc,		zfs_netbsd_print },
 	{ &vop_fcntl_desc,		zfs_netbsd_fcntl },
 	{ NULL, NULL }
 };
 const struct vnodeopv_desc zfs_fifoop_opv_desc =
 	{ &zfs_fifoop_p, zfs_fifoop_entries };
 #endif /* __NetBSD__ */

 @@ -137,30 +137,34 @@ static int zfs_root(vfs_t *vfsp, int fla
 static int zfs_netbsd_root(vfs_t *vfsp, vnode_t **vpp);
 static int zfs_statvfs(vfs_t *vfsp, struct statvfs *statp);
 static int zfs_netbsd_vptofh(vnode_t *vp, fid_t *fidp, size_t *fh_size);
 static int zfs_netbsd_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp);
 static int zfs_vget(vfs_t *vfsp, ino_t ino, vnode_t **vpp);
 static int zfs_sync(vfs_t *vfsp, int waitfor);
 static int zfs_netbsd_sync(vfs_t *vfsp, int waitfor, cred_t *cr);
 static void zfs_freevfs(vfs_t *vfsp);
 void zfs_init(void);
 void zfs_fini(void);
 extern const struct vnodeopv_desc zfs_vnodeop_opv_desc;
 extern const struct vnodeopv_desc zfs_specop_opv_desc;
 extern const struct vnodeopv_desc zfs_fifoop_opv_desc;
 extern const struct vnodeopv_desc zfs_sfsop_opv_desc;
 static const struct vnodeopv_desc * const zfs_vnodeop_descs[] = {
 	&zfs_vnodeop_opv_desc,
 	&zfs_specop_opv_desc,
 	&zfs_fifoop_opv_desc,
 	&zfs_sfsop_opv_desc,
 	NULL,
 };
 struct vfsops zfs_vfsops = {
 	.vfs_name = MOUNT_ZFS,
 	.vfs_min_mount_data = sizeof(struct zfs_args),
 	.vfs_opv_descs = zfs_vnodeop_descs,
 	.vfs_mount = zfs_mount,
 	.vfs_unmount = zfs_umount,
 	.vfs_root = zfs_netbsd_root,
 	.vfs_statvfs = zfs_statvfs,
 	.vfs_sync = zfs_netbsd_sync,

 @@ -717,34 +717,35 @@ zfs_znode_alloc(zfsvfs_t *zfsvfs, dmu_bu
 		zp->z_zn_prefetch = B_TRUE; /* z_prefetch default is enabled */
 		break;
 #if defined(illumos) || defined(__NetBSD__)
 	case VBLK:
 	case VCHR:
+		{
 			uint64_t rdev;
 			VERIFY(sa_lookup(zp->z_sa_hdl, SA_ZPL_RDEV(zfsvfs),
 			    &rdev, sizeof (rdev)) == 0);
 #ifdef illumos
 			vp->v_rdev = zfs_cmpldev(rdev);
 #else
 			vp->v_op = zfs_specop_p;
 	        	spec_node_init(vp, zfs_cmpldev(rdev));
 #endif
+		}
 		break;
 #endif
 	case VFIFO:
 #ifdef __NetBSD__
-		/* XXX NetBSD vp->v_op = zfs_fifoop_p; */
+		vp->v_op = zfs_fifoop_p;
 		break;
 #else /* __NetBSD__ */
 #ifdef illumos
 	case VSOCK:
 	case VDOOR:
 #endif
 		vp->v_op = &zfs_fifoops;
 		break;
 	case VREG:
 		if (parent == zfsvfs->z_shares_dir) {
 			ASSERT(zp->z_uid == 0 && zp->z_gid == 0);
 			vp->v_op = &zfs_shareops;
+		}