Get rid of several unused vnode operations

21 files changed, 45 insertions, 408 deletions

diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index 2ea1c91f482..78d237f41e5 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advnops.c,v 1.16 2001/02/23 14:42:37 csapuntz Exp $	*/
+/*	$OpenBSD: advnops.c,v 1.17 2001/06/23 02:14:21 csapuntz Exp $	*/
 /*	$NetBSD: advnops.c,v 1.32 1996/10/13 02:52:09 christos Exp $	*/
 
 /*
@@ -85,22 +85,15 @@ int	lease_check __P((void *));
 #else
 #define adosfs_lease_check 	adnullop
 #endif
-#define adosfs_seek 		adnullop
-#define adosfs_vfree 		adnullop
 
-#define adosfs_blkatoff 	adenotsup
 #define adosfs_bwrite 		adenotsup
 #define adosfs_create 		adenotsup
 #define adosfs_mkdir 		adenotsup
 #define adosfs_mknod 		adenotsup
-#define adosfs_mmap 		adenotsup
 #define adosfs_remove 		adenotsup
 #define adosfs_rename 		adenotsup
 #define adosfs_rmdir 		adenotsup
 #define adosfs_setattr 		adenotsup
-#define adosfs_truncate 	adenotsup
-#define adosfs_update 		adenotsup
-#define adosfs_valloc 		adenotsup
 
 struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -117,9 +110,7 @@ struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
 	{ &vop_lease_desc, adosfs_lease_check },	/* lease */
 	{ &vop_ioctl_desc, adosfs_ioctl },		/* ioctl */
 	{ &vop_select_desc, adosfs_select },		/* select */
-	{ &vop_mmap_desc, adosfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, adosfs_fsync },		/* fsync */
-	{ &vop_seek_desc, adosfs_seek },		/* seek */
 	{ &vop_remove_desc, adosfs_remove },		/* remove */
 	{ &vop_link_desc, adosfs_link },		/* link */
 	{ &vop_rename_desc, adosfs_rename },		/* rename */
@@ -139,11 +130,6 @@ struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, adosfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, adosfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, adosfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, adosfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, adosfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, adosfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, adosfs_truncate },	/* truncate */
-	{ &vop_update_desc, adosfs_update },		/* update */
 	{ &vop_bwrite_desc, adosfs_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index c542115c77f..d597dfac440 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_lookup.c,v 1.8 1999/07/01 02:20:21 d Exp $	*/
+/*	$OpenBSD: cd9660_lookup.c,v 1.9 2001/06/23 02:14:22 csapuntz Exp $	*/
 /*	$NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $	*/
 
 /*-
@@ -238,7 +238,8 @@ cd9660_lookup(v)
 	} else {
 		dp->i_offset = dp->i_diroff;
 		if ((entryoffsetinblock = dp->i_offset & bmask) &&
-		    (error = VOP_BLKATOFF(vdp, (off_t)dp->i_offset, NULL, &bp)))
+		    (error = cd9660_bufatoff(dp, (off_t)dp->i_offset, NULL, 
+			&bp)))
 				return (error);
 		numdirpasses = 2;
 		iso_nchstats.ncs_2passes++;
@@ -255,7 +256,7 @@ searchloop:
 		if ((dp->i_offset & bmask) == 0) {
 			if (bp != NULL)
 				brelse(bp);
-			error = VOP_BLKATOFF(vdp, (off_t)dp->i_offset,
+			error = cd9660_bufatoff(dp, (off_t)dp->i_offset,
 					     NULL, &bp);
 			if (error)
 				return (error);
@@ -352,7 +353,7 @@ foundino:
 			    lblkno(imp, saveoffset)) {
 				if (bp != NULL)
 					brelse(bp);
-				if ((error = VOP_BLKATOFF(vdp,
+				if ((error = cd9660_bufatoff(dp,
 					    (off_t)saveoffset, NULL, &bp)) != 0)
 					return (error);
 			}
@@ -466,33 +467,26 @@ found:
  * remaining space in the directory.
  */
 int
-cd9660_blkatoff(v)
-	void *v;
+cd9660_bufatoff(struct iso_node *ip, off_t offset, char **res, 
+    struct buf **bpp)
 {
-	struct vop_blkatoff_args /* {
-		struct vnode *a_vp;
-		off_t a_offset;
-		char **a_res;
-		struct buf **a_bpp;
-	} */ *ap = v;
-	struct iso_node *ip;
-	register struct iso_mnt *imp;
+	struct iso_mnt *imp;
 	struct buf *bp;
 	daddr_t lbn;
 	int bsize, error;
+	struct vnode *vp = ITOV(ip);
 
-	ip = VTOI(ap->a_vp);
 	imp = ip->i_mnt;
-	lbn = lblkno(imp, ap->a_offset);
+	lbn = lblkno(imp, offset);
 	bsize = blksize(imp, ip, lbn);
 	
-	if ((error = bread(ap->a_vp, lbn, bsize, NOCRED, &bp)) != 0) {
+	if ((error = bread(vp, lbn, bsize, NOCRED, &bp)) != 0) {
 		brelse(bp);
-		*ap->a_bpp = NULL;
+		*bpp = NULL;
 		return (error);
 	}
-	if (ap->a_res)
-		*ap->a_res = (char *)bp->b_data + blkoff(imp, ap->a_offset);
-	*ap->a_bpp = bp;
+	if (res)
+		*res = (char *)bp->b_data + blkoff(imp, offset);
+	*bpp = bp;
 	return (0);
 }
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 38b0e794a45..29936b7ba4c 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.c,v 1.10 1999/04/28 09:28:14 art Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.11 2001/06/23 02:14:22 csapuntz Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -323,7 +323,7 @@ cd9660_defattr(isodir, inop, bp)
 	if (!bp
 	    && ((imp = inop->i_mnt)->im_flags & ISOFSMNT_EXTATT)
 	    && (off = isonum_711(isodir->ext_attr_length))) {
-		VOP_BLKATOFF(ITOV(inop), (off_t)-(off << imp->im_bshift), NULL,
+		cd9660_bufatoff(inop, (off_t)-(off << imp->im_bshift), NULL,
 			     &bp2);
 		bp = bp2;
 	}
@@ -375,7 +375,7 @@ cd9660_deftstamp(isodir,inop,bp)
 	if (!bp
 	    && ((imp = inop->i_mnt)->im_flags & ISOFSMNT_EXTATT)
 	    && (off = isonum_711(isodir->ext_attr_length))) {
-		VOP_BLKATOFF(ITOV(inop), (off_t)-(off << imp->im_bshift), NULL,
+		cd9660_bufatoff(inop, (off_t)-(off << imp->im_bshift), NULL,
 			     &bp2);
 		bp = bp2;
 	}
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 82fb68cc201..d319e0bf8a1 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.h,v 1.9 2001/02/24 10:37:10 deraadt Exp $	*/
+/*	$OpenBSD: cd9660_node.h,v 1.10 2001/06/23 02:14:22 csapuntz Exp $	*/
 /*	$NetBSD: cd9660_node.h,v 1.15 1997/04/11 21:52:01 kleink Exp $	*/
 
 /*-
@@ -136,7 +136,8 @@ int	cd9660_strategy __P((void *));
 int	cd9660_print __P((void *));
 int	cd9660_islocked __P((void *));
 int	cd9660_pathconf __P((void *));
-int	cd9660_blkatoff __P((void *));
+
+int	cd9660_bufatoff(struct iso_node *, off_t, char **, struct buf **);
 
 void	cd9660_defattr __P((struct iso_directory_record *, struct iso_node *,
     struct buf *));
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 4b8f8dcd8fa..0d0a258687a 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.21 2001/02/20 01:50:09 assar Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.22 2001/06/23 02:14:22 csapuntz Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -842,7 +842,7 @@ retry:
 		ip->iso_start = ino >> imp->im_bshift;
 		if (bp != 0)
 			brelse(bp);
-		if ((error = VOP_BLKATOFF(vp, (off_t)0, NULL, &bp)) != 0) {
+		if ((error = cd9660_bufatoff(ip, (off_t)0, NULL, &bp)) != 0) {
 			vput(vp);
 			return (error);
 		}
@@ -862,10 +862,10 @@ retry:
 	    {
 		struct buf *bp2;
 		int off;
-		if ((imp->im_flags & ISOFSMNT_EXTATT)
-		    && (off = isonum_711(isodir->ext_attr_length)))
-			VOP_BLKATOFF(vp, (off_t)-(off << imp->im_bshift), NULL,
-				     &bp2);
+		if ((imp->im_flags & ISOFSMNT_EXTATT) && 
+		    (off = isonum_711(isodir->ext_attr_length)))
+			cd9660_bufatoff(ip, (off_t)-(off << imp->im_bshift),
+			    NULL, &bp2);
 		else
 			bp2 = NULL;
 		cd9660_defattr(isodir, ip, bp2);
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 65d3d7f1289..5f05dc9d65f 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.13 2001/02/23 14:42:38 csapuntz Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.14 2001/06/23 02:14:23 csapuntz Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -582,7 +582,7 @@ cd9660_readdir(v)
 	idp->curroff = uio->uio_offset;
 
 	if ((entryoffsetinblock = idp->curroff & bmask) &&
-	    (error = VOP_BLKATOFF(vdp, (off_t)idp->curroff, NULL, &bp))) {
+	    (error = cd9660_bufatoff(dp, (off_t)idp->curroff, NULL, &bp))) {
 		FREE(idp, M_TEMP);
 		return (error);
 	}
@@ -597,7 +597,7 @@ cd9660_readdir(v)
 		if ((idp->curroff & bmask) == 0) {
 			if (bp != NULL)
 				brelse(bp);
-			error = VOP_BLKATOFF(vdp, (off_t)idp->curroff,
+			error = cd9660_bufatoff(dp, (off_t)idp->curroff,
 					     NULL, &bp);
 			if (error)
 				break;
@@ -1024,9 +1024,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, cd9660_ioctl },	/* ioctl */
 	{ &vop_select_desc, cd9660_select },	/* select */
 	{ &vop_revoke_desc, cd9660_revoke },    /* revoke */
-	{ &vop_mmap_desc, cd9660_mmap },	/* mmap */
 	{ &vop_fsync_desc, cd9660_fsync },	/* fsync */
-	{ &vop_seek_desc, cd9660_seek },	/* seek */
 	{ &vop_remove_desc, cd9660_remove },	/* remove */
 	{ &vop_link_desc, cd9660_link },	/* link */
 	{ &vop_rename_desc, cd9660_rename },	/* rename */
@@ -1046,11 +1044,6 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
 	{ &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
 	{ &vop_advlock_desc, cd9660_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, cd9660_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, cd9660_valloc },	/* valloc */
-	{ &vop_vfree_desc, cd9660_vfree },	/* vfree */
-	{ &vop_truncate_desc, cd9660_truncate },/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -1077,9 +1070,7 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
 	{ &vop_select_desc, spec_select },	/* select */
 	{ &vop_revoke_desc, spec_revoke },    /* revoke */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, spec_fsync },	/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
 	{ &vop_remove_desc, spec_remove },	/* remove */
 	{ &vop_link_desc, spec_link },		/* link */
 	{ &vop_rename_desc, spec_rename },	/* rename */
@@ -1099,11 +1090,6 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
 	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -1128,9 +1114,7 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
 	{ &vop_select_desc, fifo_select },	/* select */
 	{ &vop_revoke_desc, fifo_revoke },      /* revoke */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
 	{ &vop_remove_desc, fifo_remove },	/* remove */
 	{ &vop_link_desc, fifo_link }	,	/* link */
 	{ &vop_rename_desc, fifo_rename },	/* rename */
@@ -1150,11 +1134,6 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
 	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 42b03423d98..219572773e6 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.19 2001/03/15 16:44:15 csapuntz Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.20 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -83,9 +83,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_select_desc, spec_select },		/* select */
 	{ &vop_kqfilter_desc, spec_kqfilter },		/* kqfilter */
 	{ &vop_revoke_desc, spec_revoke },              /* revoke */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
 	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
 	{ &vop_remove_desc, spec_remove },		/* remove */
 	{ &vop_link_desc, spec_link },			/* link */
 	{ &vop_rename_desc, spec_rename },		/* rename */
@@ -105,11 +103,6 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_islocked_desc, spec_islocked },		/* islocked */
 	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
 	{ &vop_bwrite_desc, spec_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 97e4fc3784e..fc5f2f4ecbf 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dead_vnops.c,v 1.7 1998/11/13 00:31:25 art Exp $	*/
+/*	$OpenBSD: dead_vnops.c,v 1.8 2001/06/23 02:14:23 csapuntz Exp $	*/
 /*	$NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $	*/
 
 /*
@@ -63,9 +63,7 @@ int	dead_read	__P((void *));
 int	dead_write	__P((void *));
 int	dead_ioctl	__P((void *));
 int	dead_select	__P((void *));
-#define dead_mmap	dead_badop
 #define dead_fsync	nullop
-#define dead_seek	nullop
 #define dead_remove	dead_badop
 #define dead_link	dead_badop
 #define dead_rename	dead_badop
@@ -85,11 +83,6 @@ int	dead_print	__P((void *));
 #define dead_islocked	vop_generic_islocked
 #define dead_pathconf	dead_ebadf
 #define dead_advlock	dead_ebadf
-#define dead_blkatoff	dead_badop
-#define dead_valloc	dead_badop
-#define dead_vfree	dead_badop
-#define dead_truncate	nullop
-#define dead_update	nullop
 #define dead_bwrite	nullop
 
 int	chkvnlock __P((struct vnode *));
@@ -110,9 +103,7 @@ struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_write_desc, dead_write },	/* write */
 	{ &vop_ioctl_desc, dead_ioctl },	/* ioctl */
 	{ &vop_select_desc, dead_select },	/* select */
-	{ &vop_mmap_desc, dead_mmap },		/* mmap */
 	{ &vop_fsync_desc, dead_fsync },	/* fsync */
-	{ &vop_seek_desc, dead_seek },		/* seek */
 	{ &vop_remove_desc, dead_remove },	/* remove */
 	{ &vop_link_desc, dead_link },		/* link */
 	{ &vop_rename_desc, dead_rename },	/* rename */
@@ -132,11 +123,6 @@ struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_islocked_desc, dead_islocked },	/* islocked */
 	{ &vop_pathconf_desc, dead_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, dead_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, dead_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, dead_valloc },	/* valloc */
-	{ &vop_vfree_desc, dead_vfree },	/* vfree */
-	{ &vop_truncate_desc, dead_truncate },	/* truncate */
-	{ &vop_update_desc, dead_update },	/* update */
 	{ &vop_bwrite_desc, dead_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 790eba983b9..69655c6f34d 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdesc_vnops.c,v 1.22 2001/05/23 14:34:30 art Exp $	*/
+/*	$OpenBSD: fdesc_vnops.c,v 1.23 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fdesc_vnops.c,v 1.32 1996/04/11 11:24:29 mrg Exp $	*/
 
 /*
@@ -102,9 +102,7 @@ int	fdesc_read	__P((void *));
 int	fdesc_write	__P((void *));
 int	fdesc_ioctl	__P((void *));
 int	fdesc_select	__P((void *));
-#define	fdesc_mmap	eopnotsupp
 #define	fdesc_fsync	nullop
-#define	fdesc_seek	nullop
 #define	fdesc_remove	eopnotsupp
 #define fdesc_revoke    vop_generic_revoke
 int	fdesc_link	__P((void *));
@@ -124,11 +122,6 @@ int	fdesc_print	__P((void *));
 int	fdesc_pathconf	__P((void *));
 #define	fdesc_islocked	vop_generic_islocked
 #define	fdesc_advlock	eopnotsupp
-#define	fdesc_blkatoff	eopnotsupp
-#define	fdesc_valloc	eopnotsupp
-int	fdesc_vfree	__P((void *));
-#define	fdesc_truncate	eopnotsupp
-#define	fdesc_update	eopnotsupp
 #define	fdesc_bwrite	eopnotsupp
 
 int (**fdesc_vnodeop_p) __P((void *));
@@ -147,9 +140,7 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, fdesc_ioctl },	/* ioctl */
 	{ &vop_revoke_desc, fdesc_revoke },     /* revoke */
 	{ &vop_select_desc, fdesc_select },	/* select */
-	{ &vop_mmap_desc, fdesc_mmap },		/* mmap */
 	{ &vop_fsync_desc, fdesc_fsync },	/* fsync */
-	{ &vop_seek_desc, fdesc_seek },		/* seek */
 	{ &vop_remove_desc, fdesc_remove },	/* remove */
 	{ &vop_link_desc, fdesc_link },		/* link */
 	{ &vop_rename_desc, fdesc_rename },	/* rename */
@@ -169,11 +160,6 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_islocked_desc, fdesc_islocked },	/* islocked */
 	{ &vop_pathconf_desc, fdesc_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, fdesc_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fdesc_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fdesc_valloc },	/* valloc */
-	{ &vop_vfree_desc, fdesc_vfree },	/* vfree */
-	{ &vop_truncate_desc, fdesc_truncate },	/* truncate */
-	{ &vop_update_desc, fdesc_update },	/* update */
 	{ &vop_bwrite_desc, fdesc_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -932,13 +918,6 @@ fdesc_print(v)
 }
 
 int
-fdesc_vfree(v)
-	void *v;
-{
-	return (0);
-}
-
-int
 fdesc_link(v) 
 	void *v;
 {
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 8a5b96a1dbe..2e59d7076dd 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fifo.h,v 1.7 2001/03/01 20:54:34 provos Exp $	*/
+/*	$OpenBSD: fifo.h,v 1.8 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fifo.h,v 1.10 1996/02/09 22:40:15 christos Exp $	*/
 
 /*
@@ -57,9 +57,7 @@ int	fifo_write	__P((void *));
 int	fifo_ioctl	__P((void *));
 int	fifo_select	__P((void *));
 int	fifo_kqfilter	__P((void *));
-#define fifo_mmap	fifo_badop
 #define fifo_fsync	nullop
-#define fifo_seek	fifo_badop
 #define fifo_remove	fifo_badop
 #define fifo_revoke     vop_generic_revoke
 #define fifo_link	fifo_badop
@@ -80,12 +78,7 @@ int	fifo_print	__P((void *));
 #define fifo_islocked	vop_generic_islocked
 int	fifo_pathconf	__P((void *));
 int	fifo_advlock	__P((void *));
-#define fifo_blkatoff	fifo_badop
-#define fifo_valloc	fifo_badop
 #define fifo_reallocblks fifo_badop
-#define fifo_vfree	fifo_badop
-#define fifo_truncate	nullop
-#define fifo_update	nullop
 #define fifo_bwrite	nullop
 
 void 	fifo_printinfo __P((struct vnode *));
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 142aae7f6cf..d6672bfc6ef 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fifo_vnops.c,v 1.9 2001/03/01 20:54:34 provos Exp $	*/
+/*	$OpenBSD: fifo_vnops.c,v 1.10 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $	*/
 
 /*
@@ -82,9 +82,7 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_select_desc, fifo_select },		/* select */
 	{ &vop_kqfilter_desc, fifo_kqfilter },		/* kqfilter */
 	{ &vop_revoke_desc, fifo_revoke },              /* revoke */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
 	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
 	{ &vop_remove_desc, fifo_remove },		/* remove */
 	{ &vop_link_desc, fifo_link },			/* link */
 	{ &vop_rename_desc, fifo_rename },		/* rename */
@@ -104,11 +102,6 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_islocked_desc, fifo_islocked },		/* islocked */
 	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, fifo_update },		/* update */
 	{ &vop_bwrite_desc, fifo_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 160e437ed0a..d09467aa019 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kernfs_vnops.c,v 1.19 2000/03/13 04:05:15 millert Exp $	*/
+/*	$OpenBSD: kernfs_vnops.c,v 1.20 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $	*/
 
 /*
@@ -189,9 +189,7 @@ struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, kernfs_ioctl },	/* ioctl */
 	{ &vop_select_desc, kernfs_select },	/* select */
 	{ &vop_revoke_desc, kernfs_revoke },    /* revoke */
-	{ &vop_mmap_desc, kernfs_mmap },	/* mmap */
 	{ &vop_fsync_desc, kernfs_fsync },	/* fsync */
-	{ &vop_seek_desc, kernfs_seek },	/* seek */
 	{ &vop_remove_desc, kernfs_remove },	/* remove */
 	{ &vop_link_desc, kernfs_link },	/* link */
 	{ &vop_rename_desc, kernfs_rename },	/* rename */
@@ -211,11 +209,6 @@ struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, kernfs_islocked },/* islocked */
 	{ &vop_pathconf_desc, kernfs_pathconf },/* pathconf */
 	{ &vop_advlock_desc, kernfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, kernfs_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, kernfs_valloc },	/* valloc */
-	{ &vop_vfree_desc, kernfs_vfree },	/* vfree */
-	{ &vop_truncate_desc, kernfs_truncate },/* truncate */
-	{ &vop_update_desc, kernfs_update },	/* update */
 	{ &vop_bwrite_desc, kernfs_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 9dbce2338ff..9a08301852e 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portal_vnops.c,v 1.8 1999/11/10 23:17:39 csapuntz Exp $	*/
+/*	$OpenBSD: portal_vnops.c,v 1.9 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: portal_vnops.c,v 1.17 1996/02/13 13:12:57 mycroft Exp $	*/
 
 /*
@@ -85,9 +85,7 @@ int	portal_setattr	__P((void *));
 #define	portal_write	eopnotsupp
 #define	portal_ioctl    (int (*) __P((void *)))enoioctl
 #define	portal_select	eopnotsupp
-#define	portal_mmap	eopnotsupp
 #define	portal_fsync	nullop
-#define	portal_seek	nullop
 #define	portal_remove	eopnotsupp
 int	portal_link	__P((void *));
 #define	portal_rename	eopnotsupp
@@ -107,11 +105,6 @@ int	portal_print	__P((void *));
 #define	portal_islocked	vop_generic_islocked
 int	portal_pathconf	__P((void *));
 #define	portal_advlock	eopnotsupp
-#define	portal_blkatoff	eopnotsupp
-#define	portal_valloc	eopnotsupp
-int	portal_vfree	__P((void *));
-#define	portal_truncate	eopnotsupp
-#define	portal_update	eopnotsupp
 #define	portal_bwrite	eopnotsupp
 
 int (**portal_vnodeop_p) __P((void *));
@@ -130,9 +123,7 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, portal_ioctl },		/* ioctl */
 	{ &vop_select_desc, portal_select },		/* select */
 	{ &vop_revoke_desc, portal_revoke },            /* revoke */
-	{ &vop_mmap_desc, portal_mmap },		/* mmap */
 	{ &vop_fsync_desc, portal_fsync },		/* fsync */
-	{ &vop_seek_desc, portal_seek },		/* seek */
 	{ &vop_remove_desc, portal_remove },		/* remove */
 	{ &vop_link_desc, portal_link },		/* link */
 	{ &vop_rename_desc, portal_rename },		/* rename */
@@ -152,11 +143,6 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_islocked_desc, portal_islocked },	/* islocked */
 	{ &vop_pathconf_desc, portal_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, portal_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, portal_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, portal_valloc },		/* valloc */
-	{ &vop_vfree_desc, portal_vfree },		/* vfree */
-	{ &vop_truncate_desc, portal_truncate },	/* truncate */
-	{ &vop_update_desc, portal_update },		/* update */
 	{ &vop_bwrite_desc, portal_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -686,15 +672,6 @@ portal_print(v)
 	return (0);
 }
 
-/* ARGSUSED */
-int
-portal_vfree(v)
-	void *v;
-{
-
-	return (0);
-}
-
 int
 portal_link(v) 
 	void *v;
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 5fbf6096f28..dcb5f794428 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vnops.c,v 1.18 2001/05/24 07:32:43 aaron Exp $	*/
+/*	$OpenBSD: procfs_vnops.c,v 1.19 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $	*/
 
 /*
@@ -134,9 +134,7 @@ int	procfs_setattr	__P((void *));
 #define	procfs_write	procfs_rw
 int	procfs_ioctl	__P((void *));
 #define	procfs_select	procfs_badop
-#define	procfs_mmap	procfs_badop
 #define	procfs_fsync	procfs_badop
-#define	procfs_seek	procfs_badop
 #define	procfs_remove	procfs_badop
 int	procfs_link	__P((void *));
 #define	procfs_rename	procfs_badop
@@ -155,11 +153,6 @@ int	procfs_print	__P((void *));
 int	procfs_pathconf	__P((void *));
 #define	procfs_islocked	nullop
 #define	procfs_advlock	procfs_badop
-#define	procfs_blkatoff	procfs_badop
-#define	procfs_valloc	procfs_badop
-#define	procfs_vfree	nullop
-#define	procfs_truncate	procfs_badop
-#define	procfs_update	nullop
 
 static pid_t atopid __P((const char *, u_int));
 
@@ -181,9 +174,7 @@ struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_write_desc, procfs_write },		/* write */
 	{ &vop_ioctl_desc, procfs_ioctl },		/* ioctl */
 	{ &vop_select_desc, procfs_select },		/* select */
-	{ &vop_mmap_desc, procfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, procfs_fsync },		/* fsync */
-	{ &vop_seek_desc, procfs_seek },		/* seek */
 	{ &vop_remove_desc, procfs_remove },		/* remove */
 	{ &vop_link_desc, procfs_link },		/* link */
 	{ &vop_rename_desc, procfs_rename },		/* rename */
@@ -203,11 +194,6 @@ struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, procfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, procfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, procfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, procfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, procfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, procfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, procfs_truncate },	/* truncate */
-	{ &vop_update_desc, procfs_update },		/* update */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 struct vnodeopv_desc procfs_vnodeop_opv_desc =
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 42b03423d98..219572773e6 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.19 2001/03/15 16:44:15 csapuntz Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.20 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -83,9 +83,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_select_desc, spec_select },		/* select */
 	{ &vop_kqfilter_desc, spec_kqfilter },		/* kqfilter */
 	{ &vop_revoke_desc, spec_revoke },              /* revoke */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
 	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
 	{ &vop_remove_desc, spec_remove },		/* remove */
 	{ &vop_link_desc, spec_link },			/* link */
 	{ &vop_rename_desc, spec_rename },		/* rename */
@@ -105,11 +103,6 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_islocked_desc, spec_islocked },		/* islocked */
 	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
 	{ &vop_bwrite_desc, spec_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index ea0eea0c841..7f4ab6fdecd 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specdev.h,v 1.9 2001/03/01 20:54:35 provos Exp $	*/
+/*	$OpenBSD: specdev.h,v 1.10 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: specdev.h,v 1.12 1996/02/13 13:13:01 mycroft Exp $	*/
 
 /*
@@ -98,9 +98,7 @@ int	spec_write	__P((void *));
 int	spec_ioctl	__P((void *));
 int	spec_select	__P((void *));
 int	spec_kqfilter	__P((void *));
-#define	spec_mmap	spec_badop
 int	spec_fsync	__P((void *));
-#define	spec_seek	spec_badop
 #define	spec_remove	spec_badop
 #define	spec_link	spec_badop
 #define	spec_rename	spec_badop
@@ -120,11 +118,6 @@ int	spec_strategy	__P((void *));
 int	spec_print	__P((void *));
 int	spec_pathconf	__P((void *));
 int	spec_advlock	__P((void *));
-#define	spec_blkatoff	spec_badop
-#define	spec_valloc	spec_badop
 #define	spec_reallocblks spec_badop
-#define	spec_vfree	spec_badop
-#define	spec_truncate	nullop
-#define	spec_update	nullop
 #define	spec_bwrite	vop_generic_bwrite
 #define spec_revoke     vop_generic_revoke
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index db903835be2..240c1b70c44 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: union_vnops.c,v 1.12 1998/08/18 07:08:29 deraadt Exp $	*/
+/*	$OpenBSD: union_vnops.c,v 1.13 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: union_vnops.c,v 1.30.4.1 1996/05/25 22:10:14 jtc Exp $	*/
 
 /*
@@ -73,9 +73,7 @@ int union_write		__P((void *));
 int union_lease		__P((void *));
 int union_ioctl		__P((void *));
 int union_select	__P((void *));
-int union_mmap		__P((void *));
 int union_fsync		__P((void *));
-int union_seek		__P((void *));
 int union_remove	__P((void *));
 int union_link		__P((void *));
 int union_rename	__P((void *));
@@ -114,9 +112,7 @@ struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_lease_desc, union_lease },		/* lease */
 	{ &vop_ioctl_desc, union_ioctl },		/* ioctl */
 	{ &vop_select_desc, union_select },		/* select */
-	{ &vop_mmap_desc, union_mmap },			/* mmap */
 	{ &vop_fsync_desc, union_fsync },		/* fsync */
-	{ &vop_seek_desc, union_seek },			/* seek */
 	{ &vop_remove_desc, union_remove },		/* remove */
 	{ &vop_link_desc, union_link },			/* link */
 	{ &vop_rename_desc, union_rename },		/* rename */
@@ -137,14 +133,6 @@ struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_islocked_desc, union_islocked },		/* islocked */
 	{ &vop_pathconf_desc, union_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, union_advlock },		/* advlock */
-#ifdef notdef
-	{ &vop_blkatoff_desc, union_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, union_valloc },		/* valloc */
-	{ &vop_vfree_desc, union_vfree },		/* vfree */
-	{ &vop_truncate_desc, union_truncate },		/* truncate */
-	{ &vop_update_desc, union_update },		/* update */
-	{ &vop_bwrite_desc, union_bwrite },		/* bwrite */
-#endif
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 struct vnodeopv_desc union_vnodeop_opv_desc =
@@ -1012,22 +1000,6 @@ union_select(v)
 }
 
 int
-union_mmap(v)
-	void *v;
-{
-	struct vop_mmap_args /* {
-		struct vnode *a_vp;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-	register struct vnode *vp = OTHERVP(ap->a_vp);
-
-	ap->a_vp = vp;
-	return (VCALL(vp, VOFFSET(vop_mmap), ap));
-}
-
-int
 union_fsync(v)
 	void *v;
 {
@@ -1057,22 +1029,6 @@ union_fsync(v)
 	return (error);
 }
 
-int
-union_seek(v)
-	void *v;
-{
-	struct vop_seek_args /* {
-		struct vnode *a_vp;
-		off_t  a_oldoff;
-		off_t  a_newoff;
-		struct ucred *a_cred;
-	} */ *ap = v;
-	register struct vnode *vp = OTHERVP(ap->a_vp);
-
-	ap->a_vp = vp;
-	return (VCALL(vp, VOFFSET(vop_seek), ap));
-}
-
 /* a_dvp: directory in which to link
    a_vp: new target of the link
    a_cnp: name for the link
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5b51ee31418..563eec090f6 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.30 2001/06/05 21:56:14 provos Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.31 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -105,9 +105,7 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
 	{ &vop_select_desc, nfs_select },	/* select */
 	{ &vop_kqfilter_desc, vop_generic_kqfilter },	/* kqfilter */
 	{ &vop_revoke_desc, nfs_revoke },	/* revoke */
-	{ &vop_mmap_desc, nfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, nfs_seek },		/* seek */
 	{ &vop_remove_desc, nfs_remove },	/* remove */
 	{ &vop_link_desc, nfs_link },		/* link */
 	{ &vop_rename_desc, nfs_rename },	/* rename */
@@ -127,12 +125,7 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, nfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, nfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, nfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, nfs_valloc },	/* valloc */
 	{ &vop_reallocblks_desc, nfs_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, nfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, nfs_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, nfs_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -159,9 +152,7 @@ struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
 	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
 	{ &vop_select_desc, spec_select },	/* select */
 	{ &vop_revoke_desc, spec_revoke },	/* revoke */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
 	{ &vop_remove_desc, spec_remove },	/* remove */
 	{ &vop_link_desc, spec_link },		/* link */
 	{ &vop_rename_desc, spec_rename },	/* rename */
@@ -181,12 +172,7 @@ struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
 	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -211,9 +197,7 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
 	{ &vop_select_desc, fifo_select },	/* select */
 	{ &vop_revoke_desc, fifo_revoke },	/* revoke */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
 	{ &vop_remove_desc, fifo_remove },	/* remove */
 	{ &vop_link_desc, fifo_link },		/* link */
 	{ &vop_rename_desc, fifo_rename },	/* rename */
@@ -233,12 +217,7 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
 	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -2607,28 +2586,6 @@ nfs_strategy(v)
 }
 
 /*
- * Mmap a file
- *
- * NB Currently unsupported.
- */
-/* ARGSUSED */
-int
-nfs_mmap(v)
-	void *v;
-{
-#if 0
-	struct vop_mmap_args /* {
-		struct vnode *a_vp;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-#endif
-
-	return (EINVAL);
-}
-
-/*
  * fsync vnode op. Just call nfs_flush() with commit == 1.
  */
 /* ARGSUSED */
@@ -2911,106 +2868,6 @@ nfs_print(v)
 }
 
 /*
- * NFS directory offset lookup.
- * Currently unsupported.
- */
-int
-nfs_blkatoff(v)
-	void *v;
-{
-#if 0
-	struct vop_blkatoff_args /* {
-		struct vnode *a_vp;
-		off_t a_offset;
-		char **a_res;
-		struct buf **a_bpp;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS flat namespace allocation.
- * Currently unsupported.
- */
-int
-nfs_valloc(v)
-	void *v;
-{
-#if 0
-	struct vop_valloc_args /* {
-		struct vnode *a_pvp;
-		int a_mode;
-		struct ucred *a_cred;
-		struct vnode **a_vpp;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS flat namespace free.
- * Currently unsupported.
- */
-int
-nfs_vfree(v)
-	void *v;
-{
-#if 0
-	struct vop_vfree_args /* {
-		struct vnode *a_pvp;
-		ino_t a_ino;
-		int a_mode;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS file truncation.
- */
-int
-nfs_truncate(v)
-	void *v;
-{
-#if 0
-	struct vop_truncate_args /* {
-		struct vnode *a_vp;
-		off_t a_length;
-		int a_flags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-#endif
-
-	/* Use nfs_setattr */
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS update.
- */
-int
-nfs_update(v)
-	void *v;
-#if 0
-	struct vop_update_args /* {
-		struct vnode *a_vp;
-		struct timespec *a_ta;
-		struct timespec *a_tm;
-		int a_waitfor;
-	} */ *ap = v;
-#endif
-{
-
-	/* Use nfs_setattr */
-	return (EOPNOTSUPP);
-}
-
-/*
  * Just call nfs_writebp() with the force argument set to 1.
  */
 int
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index d74feea493a..96c383429bb 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsnode.h,v 1.7 1998/08/06 19:35:02 csapuntz Exp $	*/
+/*	$OpenBSD: nfsnode.h,v 1.8 2001/06/23 02:14:27 csapuntz Exp $	*/
 /*	$NetBSD: nfsnode.h,v 1.16 1996/02/18 11:54:04 fvdl Exp $	*/
 
 /*
@@ -177,9 +177,7 @@ int	nfsfifo_write __P((void *));
 #define nfs_ioctl ((int (*) __P((void *)))enoioctl)
 #define nfs_select ((int (*) __P((void *)))seltrue)
 #define nfs_revoke vop_generic_revoke
-int	nfs_mmap __P((void *));
 int	nfs_fsync __P((void *));
-#define nfs_seek ((int (*) __P((void *)))nullop)
 int	nfs_remove __P((void *));
 int	nfs_link __P((void *));
 int	nfs_rename __P((void *));
@@ -198,15 +196,10 @@ int	nfs_strategy __P((void *));
 int	nfs_print __P((void *));
 int	nfs_pathconf __P((void *));
 int	nfs_advlock __P((void *));
-int	nfs_blkatoff __P((void *));
 int	nfs_bwrite __P((void *));
 int	nfs_vget __P((struct mount *, ino_t, struct vnode **));
-int	nfs_valloc __P((void *));
 #define nfs_reallocblks \
 	((int (*) __P((void *)))eopnotsupp)
-int	nfs_vfree __P((void *));
-int	nfs_truncate __P((void *));
-int	nfs_update __P((void *));
 
 /* other stuff */
 int	nfs_removeit __P((struct sillyrename *));
diff --git a/sys/sys/specdev.h b/sys/sys/specdev.h
index ea0eea0c841..7f4ab6fdecd 100644
--- a/sys/sys/specdev.h
+++ b/sys/sys/specdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specdev.h,v 1.9 2001/03/01 20:54:35 provos Exp $	*/
+/*	$OpenBSD: specdev.h,v 1.10 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: specdev.h,v 1.12 1996/02/13 13:13:01 mycroft Exp $	*/
 
 /*
@@ -98,9 +98,7 @@ int	spec_write	__P((void *));
 int	spec_ioctl	__P((void *));
 int	spec_select	__P((void *));
 int	spec_kqfilter	__P((void *));
-#define	spec_mmap	spec_badop
 int	spec_fsync	__P((void *));
-#define	spec_seek	spec_badop
 #define	spec_remove	spec_badop
 #define	spec_link	spec_badop
 #define	spec_rename	spec_badop
@@ -120,11 +118,6 @@ int	spec_strategy	__P((void *));
 int	spec_print	__P((void *));
 int	spec_pathconf	__P((void *));
 int	spec_advlock	__P((void *));
-#define	spec_blkatoff	spec_badop
-#define	spec_valloc	spec_badop
 #define	spec_reallocblks spec_badop
-#define	spec_vfree	spec_badop
-#define	spec_truncate	nullop
-#define	spec_update	nullop
 #define	spec_bwrite	vop_generic_bwrite
 #define spec_revoke     vop_generic_revoke
diff --git a/sys/xfs/xfs_vopdefs.h b/sys/xfs/xfs_vopdefs.h
index a094f511f99..4bbf5df2391 100644
--- a/sys/xfs/xfs_vopdefs.h
+++ b/sys/xfs/xfs_vopdefs.h
@@ -13,9 +13,7 @@
 #define HAVE_VOP_IOCTL 1
 #define HAVE_VOP_SELECT 1
 #define HAVE_VOP_REVOKE 1
-#define HAVE_VOP_MMAP 1
 #define HAVE_VOP_FSYNC 1
-#define HAVE_VOP_SEEK 1
 #define HAVE_VOP_REMOVE 1
 #define HAVE_VOP_LINK 1
 #define HAVE_VOP_RENAME 1
@@ -34,12 +32,6 @@
 #define HAVE_VOP_PATHCONF 1
 #define HAVE_VOP_ADVLOCK 1
 #define HAVE_VOP_BLKATOFF 1
-#define HAVE_VOP_VALLOC 1
-#define HAVE_VOP_BALLOC 1
-#define HAVE_VOP_REALLOCBLKS 1
-#define HAVE_VOP_VFREE 1
-#define HAVE_VOP_TRUNCATE 1
-#define HAVE_VOP_UPDATE 1
 #define HAVE_VOP_WHITEOUT 1
 #define HAVE_VOP_STRATEGY 1
 #define HAVE_VOP_BWRITE 1