 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_fs.c,v 1.93 2021/02/16 14:47:20 simonb Exp $	*/
+/*	$NetBSD: netbsd32_fs.c,v 1.94 2021/09/11 10:08:55 riastradh Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * 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.
 @@ -17,27 +17,27 @@
  * 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: netbsd32_fs.c,v 1.93 2021/02/16 14:47:20 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.94 2021/09/11 10:08:55 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ktrace.h>
 #include <sys/resourcevar.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 @@ -638,97 +638,85 @@ netbsd32___fhstat50(struct lwp *l, const
+}
 int
 netbsd32_preadv(struct lwp *l, const struct netbsd32_preadv_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
 		syscallarg(int) pad;
 		syscallarg(netbsd32_off_t) offset;
 	} */
 	file_t *fp;
 	struct vnode *vp;
 	off_t offset;
 	int error, fd = SCARG(uap, fd);
 	if ((fp = fd_getfile(fd)) == NULL)
 		return EBADF;
 	if ((fp->f_flag & FREAD) == 0) {
 		fd_putfile(fd);
 		return EBADF;
+	}
-	vp = fp->f_vnode;
+	if (fp->f_ops->fo_seek == NULL) {
 	if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
 		error = ESPIPE;
 		goto out;
+	}
 	offset = SCARG(uap, offset);
 	error = (*fp->f_ops->fo_seek)(fp, offset, SEEK_SET, &offset, 0);
-	/*
+	if (error)
 	 * XXX This works because no file systems actually
 	 * XXX take any action on the seek operation.
 	 */
 	if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
 		goto out;
 	return dofilereadv32(fd, fp, SCARG_P32(uap, iovp),
 	    SCARG(uap, iovcnt), &offset, 0, retval);
 out:
 	fd_putfile(fd);
 	return error;
+}
 int
 netbsd32_pwritev(struct lwp *l, const struct netbsd32_pwritev_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const netbsd32_iovecp_t) iovp;
 		syscallarg(int) iovcnt;
 		syscallarg(int) pad;
 		syscallarg(netbsd32_off_t) offset;
 	} */
 	file_t *fp;
 	struct vnode *vp;
 	off_t offset;
 	int error, fd = SCARG(uap, fd);
 	if ((fp = fd_getfile(fd)) == NULL)
 		return EBADF;
 	if ((fp->f_flag & FWRITE) == 0) {
 		fd_putfile(fd);
 		return EBADF;
+	}
-	vp = fp->f_vnode;
+	if (fp->f_ops->fo_seek == NULL) {
 	if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
 		error = ESPIPE;
 		goto out;
+	}
 	offset = SCARG(uap, offset);
 	error = (*fp->f_ops->fo_seek)(fp, offset, SEEK_SET, &offset, 0);
-	/*
+	if (error)
 	 * XXX This works because no file systems actually
 	 * XXX take any action on the seek operation.
 	 */
 	if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
 		goto out;
 	return dofilewritev32(fd, fp, SCARG_P32(uap, iovp),
 	    SCARG(uap, iovcnt), &offset, 0, retval);
 out:
 	fd_putfile(fd);
 	return error;
+}
 /*
  * Find pathname of process's current directory.
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_generic.c,v 1.132 2020/05/23 23:42:43 ad Exp $	*/
+/*	$NetBSD: sys_generic.c,v 1.133 2021/09/11 10:08:55 riastradh Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -60,27 +60,27 @@
  * 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.
+ *
  *	@(#)sys_generic.c	8.9 (Berkeley) 2/14/95
  */
 /*
  * System calls relating to files.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.132 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.133 2021/09/11 10:08:55 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/kmem.h>
 @@ -198,37 +198,38 @@ do_filereadv(int fd, const struct iovec
 		return EINVAL;
 	if ((fp = fd_getfile(fd)) == NULL)
 		return EBADF;
 	if ((fp->f_flag & FREAD) == 0) {
 		fd_putfile(fd);
 		return EBADF;
+	}
 	if (offset == NULL)
 		offset = &fp->f_offset;
 	else {
-		struct vnode *vp = fp->f_vnode;
+		/*
-		if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
+		 * Caller must not specify &fp->f_offset -- we can't
 		 * safely dereference it for the call to fo_seek
 		 * without holding some underlying object lock.
 		 */
 		KASSERT(offset != &fp->f_offset);
 		if (fp->f_ops->fo_seek == NULL) {
 			error = ESPIPE;
 			goto out;
+		}
-		/*
+		error = (*fp->f_ops->fo_seek)(fp, *offset, SEEK_SET, NULL,
-		 * Test that the device is seekable ?
+);
 		 * XXX This works because no file systems actually
 		 * XXX take any action on the seek operation.
 		 */
 		error = VOP_SEEK(vp, fp->f_offset, *offset, fp->f_cred);
 		if (error != 0)
 			goto out;
+	}
 	iovlen = iovcnt * sizeof(struct iovec);
 	if (flags & FOF_IOV_SYSSPACE)
 		iov = __UNCONST(iovp);
 	else {
 		iov = aiov;
 		if ((u_int)iovcnt > UIO_SMALLIOV) {
 			if ((u_int)iovcnt > IOV_MAX) {
 				error = EINVAL;
 				goto out;
 @@ -398,37 +399,38 @@ do_filewritev(int fd, const struct iovec
 		return EINVAL;
 	if ((fp = fd_getfile(fd)) == NULL)
 		return EBADF;
 	if ((fp->f_flag & FWRITE) == 0) {
 		fd_putfile(fd);
 		return EBADF;
+	}
 	if (offset == NULL)
 		offset = &fp->f_offset;
 	else {
-		struct vnode *vp = fp->f_vnode;
+		/*
-		if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
+		 * Caller must not specify &fp->f_offset -- we can't
 		 * safely dereference it for the call to fo_seek
 		 * without holding some underlying object lock.
 		 */
 		KASSERT(offset != &fp->f_offset);
 		if (fp->f_ops->fo_seek == NULL) {
 			error = ESPIPE;
 			goto out;
+		}
-		/*
+		error = (*fp->f_ops->fo_seek)(fp, *offset, SEEK_SET, NULL,
-		 * Test that the device is seekable ?
+);
 		 * XXX This works because no file systems actually
 		 * XXX take any action on the seek operation.
 		 */
 		error = VOP_SEEK(vp, fp->f_offset, *offset, fp->f_cred);
 		if (error != 0)
 			goto out;
+	}
 	iovlen = iovcnt * sizeof(struct iovec);
 	if (flags & FOF_IOV_SYSSPACE)
 		iov = __UNCONST(iovp);
 	else {
 		iov = aiov;
 		if ((u_int)iovcnt > UIO_SMALLIOV) {
 			if ((u_int)iovcnt > IOV_MAX) {
 				error = EINVAL;
 				goto out;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_syscalls.c,v 1.551 2021/07/03 09:39:26 mlelstv Exp $	*/
+/*	$NetBSD: vfs_syscalls.c,v 1.552 2021/09/11 10:08:55 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -60,27 +60,27 @@
  * 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.
+ *
  *	@(#)vfs_syscalls.c	8.42 (Berkeley) 7/31/95
  */
 /*
  * Virtual File System System Calls
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.551 2021/07/03 09:39:26 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.552 2021/09/11 10:08:55 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_fileassoc.h"
 #include "veriexec.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 @@ -2846,113 +2846,87 @@ out:
 /*
  * Reposition read/write file offset.
  */
 int
 sys_lseek(struct lwp *l, const struct sys_lseek_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(int) pad;
 		syscallarg(off_t) offset;
 		syscallarg(int) whence;
 	} */
 	kauth_cred_t cred = l->l_cred;
 	file_t *fp;
 	struct vnode *vp;
 	struct vattr vattr;
 	off_t newoff;
 	int error, fd;
 	switch (SCARG(uap, whence)) {
 	case SEEK_CUR:
 	case SEEK_END:
 	case SEEK_SET:
 		break;
 	default:
 		return EINVAL;
+	}
 	fd = SCARG(uap, fd);
 	if ((fp = fd_getfile(fd)) == NULL)
 		return (EBADF);
-	vp = fp->f_vnode;
+	if (fp->f_ops->fo_seek == NULL) {
 	if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
 		error = ESPIPE;
 		goto out;
+	}
-	vn_lock(vp, LK_SHARED | LK_RETRY);
+	error = (*fp->f_ops->fo_seek)(fp, SCARG(uap, offset),
 	    SCARG(uap, whence), (off_t *)retval, FOF_UPDATE_OFFSET);
 	switch (SCARG(uap, whence)) {
 	case SEEK_CUR:
 		newoff = fp->f_offset + SCARG(uap, offset);
 		break;
 	case SEEK_END:
 		error = VOP_GETATTR(vp, &vattr, cred);
 		if (error) {
 			VOP_UNLOCK(vp);
 			goto out;
 		newoff = SCARG(uap, offset) + vattr.va_size;
 		break;
 	case SEEK_SET:
 		newoff = SCARG(uap, offset);
 		break;
 	default:
 		error = EINVAL;
 		VOP_UNLOCK(vp);
 		goto out;
 	VOP_UNLOCK(vp);
 	if ((error = VOP_SEEK(vp, fp->f_offset, newoff, cred)) == 0) {
 		*(off_t *)retval = fp->f_offset = newoff;
  out:
  	fd_putfile(fd);
 	return (error);
+}
 /*
  * Positional read system call.
  */
 int
 sys_pread(struct lwp *l, const struct sys_pread_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(void *) buf;
 		syscallarg(size_t) nbyte;
 		syscallarg(off_t) offset;
 	} */
 	file_t *fp;
 	struct vnode *vp;
 	off_t offset;
 	int error, fd = SCARG(uap, fd);
 	if ((fp = fd_getfile(fd)) == NULL)
 		return (EBADF);
 	if ((fp->f_flag & FREAD) == 0) {
 		fd_putfile(fd);
 		return (EBADF);
+	}
-	vp = fp->f_vnode;
+	if (fp->f_ops->fo_seek == NULL) {
 	if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
 		error = ESPIPE;
 		goto out;
+	}
 	offset = SCARG(uap, offset);
 	error = (*fp->f_ops->fo_seek)(fp, offset, SEEK_SET, &offset, 0);
-	/*
+	if (error)
 	 * XXX This works because no file systems actually
 	 * XXX take any action on the seek operation.
 	 */
 	if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
 		goto out;
 	/* dofileread() will unuse the descriptor for us */
 	return (dofileread(fd, fp, SCARG(uap, buf), SCARG(uap, nbyte),
 	    &offset, 0, retval));
  out:
 	fd_putfile(fd);
 	return (error);
+}
 /*
  * Positional scatter read system call.
 @@ -2975,51 +2949,45 @@ sys_preadv(struct lwp *l, const struct s
 /*
  * Positional write system call.
  */
 int
 sys_pwrite(struct lwp *l, const struct sys_pwrite_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) fd;
 		syscallarg(const void *) buf;
 		syscallarg(size_t) nbyte;
 		syscallarg(off_t) offset;
 	} */
 	file_t *fp;
 	struct vnode *vp;
 	off_t offset;
 	int error, fd = SCARG(uap, fd);
 	if ((fp = fd_getfile(fd)) == NULL)
 		return (EBADF);
 	if ((fp->f_flag & FWRITE) == 0) {
 		fd_putfile(fd);
 		return (EBADF);
+	}
-	vp = fp->f_vnode;
+	if (fp->f_ops->fo_seek == NULL) {
 	if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
 		error = ESPIPE;
 		goto out;
+	}
 	offset = SCARG(uap, offset);
 	error = (*fp->f_ops->fo_seek)(fp, offset, SEEK_SET, &offset, 0);
-	/*
+	if (error)
 	 * XXX This works because no file systems actually
 	 * XXX take any action on the seek operation.
 	 */
 	if ((error = VOP_SEEK(vp, fp->f_offset, offset, fp->f_cred)) != 0)
 		goto out;
 	/* dofilewrite() will unuse the descriptor for us */
 	return (dofilewrite(fd, fp, SCARG(uap, buf), SCARG(uap, nbyte),
 	    &offset, 0, retval));
  out:
 	fd_putfile(fd);
 	return (error);
+}
 /*
  * Positional gather write system call.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_vnops.c,v 1.221 2021/07/18 09:30:36 dholland Exp $	*/
+/*	$NetBSD: vfs_vnops.c,v 1.222 2021/09/11 10:08:55 riastradh Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -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.
+ *
  *	@(#)vfs_vnops.c	8.14 (Berkeley) 6/15/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.221 2021/07/18 09:30:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.222 2021/09/11 10:08:55 riastradh Exp $");
 #include "veriexec.h"
 #include <sys/param.h>
 #include <sys/systm.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/namei.h>
 #include <sys/vnode.h>
 @@ -111,39 +111,41 @@ int (*vn_union_readdir_hook) (struct vno
 #include <sys/verified_exec.h>
 static int vn_read(file_t *fp, off_t *offset, struct uio *uio,
 	    kauth_cred_t cred, int flags);
 static int vn_write(file_t *fp, off_t *offset, struct uio *uio,
 	    kauth_cred_t cred, int flags);
 static int vn_closefile(file_t *fp);
 static int vn_poll(file_t *fp, int events);
 static int vn_fcntl(file_t *fp, u_int com, void *data);
 static int vn_statfile(file_t *fp, struct stat *sb);
 static int vn_ioctl(file_t *fp, u_long com, void *data);
 static int vn_mmap(struct file *, off_t *, size_t, int, int *, int *,
 		   struct uvm_object **, int *);
 static int vn_seek(struct file *, off_t, int, off_t *, int);
 const struct fileops vnops = {
 	.fo_name = "vn",
 	.fo_read = vn_read,
 	.fo_write = vn_write,
 	.fo_ioctl = vn_ioctl,
 	.fo_fcntl = vn_fcntl,
 	.fo_poll = vn_poll,
 	.fo_stat = vn_statfile,
 	.fo_close = vn_closefile,
 	.fo_kqfilter = vn_kqfilter,
 	.fo_restart = fnullop_restart,
 	.fo_mmap = vn_mmap,
 	.fo_seek = vn_seek,
 };
 /*
  * Common code for vnode open operations.
  * Check permissions, and call the VOP_OPEN or VOP_CREATE routine.
+ *
  * at_dvp is the directory for openat(), if any.
  * pb is the path.
  * nmode is additional namei flags, restricted to TRYEMULROOT and NOCHROOT.
  * fmode is the open flags, converted from O_* to F*
  * cmode is the creation file permissions.
+ *
  * XXX shouldn't cmode be mode_t?
 @@ -1100,27 +1102,76 @@ vn_mmap(struct file *fp, off_t *offp, si
 		 * it can't be made executable later.
 		 */
 		maxprot &= ~VM_PROT_EXECUTE;
+	}
 #endif /* NVERIEXEC > 0 */
 	*uobjp = uobj;
 	*maxprotp = maxprot;
 	*flagsp = flags;
 	return 0;
+}
 static int
 vn_seek(struct file *fp, off_t delta, int whence, off_t *newoffp,
     int flags)
+{
 	kauth_cred_t cred = fp->f_cred;
 	off_t oldoff, newoff;
 	struct vnode *vp = fp->f_vnode;
 	struct vattr vattr;
 	int error;
 	if (vp->v_type == VFIFO)
 		return ESPIPE;
 	vn_lock(vp, LK_SHARED | LK_RETRY);
 	/* Compute the old and new offsets.  */
 	oldoff = fp->f_offset;
 	switch (whence) {
 	case SEEK_CUR:
 		newoff = oldoff + delta; /* XXX arithmetic overflow */
 		break;
 	case SEEK_END:
 		error = VOP_GETATTR(vp, &vattr, cred);
 		if (error)
 			goto out;
 		newoff = delta + vattr.va_size; /* XXX arithmetic overflow */
 		break;
 	case SEEK_SET:
 		newoff = delta;
 		break;
 	default:
 		error = EINVAL;
 		goto out;
+	}
 	/* Pass the proposed change to the file system to audit.  */
 	error = VOP_SEEK(vp, oldoff, newoff, cred);
 	if (error)
 		goto out;
 	/* Success!  */
 	if (newoffp)
 		*newoffp = newoff;
 	if (flags & FOF_UPDATE_OFFSET)
 		fp->f_offset = newoff;
 	error = 0;
 out:	VOP_UNLOCK(vp);
 	return error;
+}
 /*
  * Check that the vnode is still valid, and if so
  * acquire requested lock.
  */
 int
 vn_lock(struct vnode *vp, int flags)
+{
 	struct lwp *l;
 	int error;
 #if 0
 	KASSERT(vrefcnt(vp) > 0 || (vp->v_iflag & VI_ONWORKLST) != 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: file.h,v 1.86 2020/05/02 18:43:02 christos Exp $	*/
+/*	$NetBSD: file.h,v 1.87 2021/09/11 10:08:55 riastradh Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -84,27 +84,27 @@ struct fileops {
 	int	(*fo_read)	(struct file *, off_t *, struct uio *,
 				    kauth_cred_t, int);
 	int	(*fo_write)	(struct file *, off_t *, struct uio *,
 				    kauth_cred_t, int);
 	int	(*fo_ioctl)	(struct file *, u_long, void *);
 	int	(*fo_fcntl)	(struct file *, u_int, void *);
 	int	(*fo_poll)	(struct file *, int);
 	int	(*fo_stat)	(struct file *, struct stat *);
 	int	(*fo_close)	(struct file *);
 	int	(*fo_kqfilter)	(struct file *, struct knote *);
 	void	(*fo_restart)	(struct file *);
 	int	(*fo_mmap)	(struct file *, off_t *, size_t, int, int *,
 				 int *, struct uvm_object **, int *);
-	void	(*fo_spare2)	(void);
+	int	(*fo_seek)	(struct file *, off_t, int, off_t *, int);
 };
 union file_data {
 	struct vnode *fd_vp;		// DTYPE_VNODE
 	struct socket *fd_so;		// DTYPE_SOCKET
 	struct pipe *fd_pipe;		// DTYPE_PIPE
 	struct kqueue *fd_kq;		// DTYPE_KQUEUE
 	void *fd_data;			// DTYPE_MISC
 	struct audio_file *fd_audioctx;	// DTYPE_MISC (audio)
 	struct pad_softc *fd_pad;	// DTYPE_MISC (pad)
 	int fd_devunit;			// DTYPE_MISC (tap)
 	struct bpf_d *fd_bpf;		// DTYPE_MISC (bpf)
 	struct fcrypt *fd_fcrypt;	// DTYPE_CRYPTO is not used