VFS mega cleanup commit (x/N)

1.  Add new file "sys/kern/vfs_default.c" where default actions for
    VOPs go. Implement proper defaults for ABORTOP, BWRITE, LEASE,
    POLL, REVOKE and STRATEGY.  Various stuff spread over the entire
    tree belongs here.

2.  Change VOP_BLKATOFF to a normal function in cd9660.

3.  Kill VOP_BLKATOFF, VOP_TRUNCATE, VOP_VFREE, VOP_VALLOC.  These
    are private interface functions between UFS and the underlying
    storage manager layer (FFS/LFS/MFS/EXT2FS).  The functions now
    live in struct ufsmount instead.

4.  Remove a kludge of VOP_ functions in all filesystems, that did
    nothing but obscure the simplicity and break the expandability.
    If a filesystem doesn't implement VOP_FOO, it shouldn't have an
    entry for it in its vnops table.  The system will try to DTRT
    if it is not implemented.  There are still some cruft left, but
    the bulk of it is done.

5.  Fix another VCALL in vfs_cache.c (thanks Bruce!)

12 files changed, 93 insertions, 413 deletions

diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index d416a98..cf36e92 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.17 1997/08/26 07:32:30 phk Exp $
+ * $Id: cd9660_lookup.c,v 1.18 1997/09/10 19:43:15 phk Exp $
  */
 
 #include <sys/param.h>
@@ -165,7 +165,7 @@ cd9660_lookup(ap)
 	} 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_blkatoff(vdp, (off_t)dp->i_offset, NULL, &bp)))
 				return (error);
 		numdirpasses = 2;
 		nchstats.ncs_2passes++;
@@ -183,7 +183,7 @@ searchloop:
 			if (bp != NULL)
 				brelse(bp);
 			if (error =
-			    VOP_BLKATOFF(vdp, (off_t)dp->i_offset, NULL, &bp))
+			    cd9660_blkatoff(vdp, (off_t)dp->i_offset, NULL, &bp))
 				return (error);
 			entryoffsetinblock = 0;
 		}
@@ -280,7 +280,7 @@ foundino:
 			    lblkno(imp, saveoffset)) {
 				if (bp != NULL)
 					brelse(bp);
-				if (error = VOP_BLKATOFF(vdp,
+				if (error = cd9660_blkatoff(vdp,
 				    (off_t)saveoffset, NULL, &bp))
 					return (error);
 			}
@@ -394,13 +394,11 @@ found:
  * remaining space in the directory.
  */
 int
-cd9660_blkatoff(ap)
-	struct vop_blkatoff_args /* {
-		struct vnode *a_vp;
-		off_t a_offset;
-		char **a_res;
-		struct buf **a_bpp;
-	} */ *ap;
+cd9660_blkatoff(vp, offset, res, bpp)
+	struct vnode *vp;
+	off_t offset;
+	char **res;
+	struct buf **bpp;
 {
 	struct iso_node *ip;
 	register struct iso_mnt *imp;
@@ -408,18 +406,18 @@ cd9660_blkatoff(ap)
 	daddr_t lbn;
 	int bsize, error;
 
-	ip = VTOI(ap->a_vp);
+	ip = VTOI(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)) {
+	if (error = bread(vp, lbn, bsize, NOCRED, &bp)) {
 		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/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 8db9633..0ac56f8 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.19 1997/04/14 18:15:45 phk Exp $
+ * $Id: cd9660_node.c,v 1.20 1997/08/02 14:31:18 bde Exp $
  */
 
 #include <sys/param.h>
@@ -241,7 +241,7 @@ cd9660_defattr(isodir, inop, bp, ftype)
 	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_blkatoff(ITOV(inop), (off_t)-(off << imp->im_bshift), NULL,
 			     &bp2);
 		bp = bp2;
 	}
@@ -293,7 +293,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype)
 	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_blkatoff(ITOV(inop), (off_t)-(off << imp->im_bshift), NULL,
 			     &bp2);
 		bp = bp2;
 	}
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 92e214f..5c0b721 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.12 1997/08/26 07:32:31 phk Exp $
+ * $Id: cd9660_node.h,v 1.13 1997/10/12 20:23:36 phk Exp $
  */
 
 /*
@@ -105,8 +105,7 @@ int cd9660_inactive __P((struct vop_inactive_args *));
 int cd9660_reclaim __P((struct vop_reclaim_args *));
 int cd9660_bmap __P((struct vop_bmap_args *));
 int cd9660_pathconf __P((struct vop_pathconf_args *));
-int cd9660_blkatoff __P((struct vop_blkatoff_args *));
-#define cd9660_revoke vop_revoke
+int cd9660_blkatoff __P((struct vnode *vp, off_t offset, char **res, struct buf **bpp));
 
 void cd9660_defattr __P((struct iso_directory_record *,
 			struct iso_node *, struct buf *, enum ISO_FTYPE));
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 3d23f09..d3db4a1 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.29 1997/09/27 13:38:48 kato Exp $
+ * $Id: cd9660_vfsops.c,v 1.30 1997/10/12 20:23:38 phk Exp $
  */
 
 #include <sys/param.h>
@@ -765,7 +765,7 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 		ip->iso_start = ino >> imp->im_bshift;
 		if (bp != 0)
 			brelse(bp);
-		if (error = VOP_BLKATOFF(vp, (off_t)0, NULL, &bp)) {
+		if (error = cd9660_blkatoff(vp, (off_t)0, NULL, &bp)) {
 			vput(vp);
 			return (error);
 		}
@@ -787,7 +787,7 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
 		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,
+			cd9660_blkatoff(vp, (off_t)-(off << imp->im_bshift), NULL,
 				     &bp2);
 		else
 			bp2 = NULL;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 607d7d6..b794436 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.42 1997/10/15 10:03:58 phk Exp $
+ * $Id: cd9660_vnops.c,v 1.43 1997/10/15 13:22:39 phk Exp $
  */
 
 #include <sys/param.h>
@@ -569,7 +569,7 @@ cd9660_readdir(ap)
 	idp->curroff = uio->uio_offset;
 
 	if ((entryoffsetinblock = idp->curroff & bmask) &&
-	    (error = VOP_BLKATOFF(vdp, (off_t)idp->curroff, NULL, &bp))) {
+	    (error = cd9660_blkatoff(vdp, (off_t)idp->curroff, NULL, &bp))) {
 		FREE(idp, M_TEMP);
 		return (error);
 	}
@@ -585,7 +585,7 @@ cd9660_readdir(ap)
 			if (bp != NULL)
 				brelse(bp);
 			if (error =
-			    VOP_BLKATOFF(vdp, (off_t)idp->curroff, NULL, &bp))
+			    cd9660_blkatoff(vdp, (off_t)idp->curroff, NULL, &bp))
 				break;
 			entryoffsetinblock = 0;
 		}
@@ -953,44 +953,6 @@ cd9660_pathconf(ap)
 }
 
 /*
- * Global vfs data structures for isofs
- */
-#define cd9660_create \
-	((int (*) __P((struct  vop_create_args *)))eopnotsupp)
-#define cd9660_mknod ((int (*) __P((struct  vop_mknod_args *)))eopnotsupp)
-#define cd9660_write ((int (*) __P((struct  vop_write_args *)))eopnotsupp)
-#ifdef NFS
-#define	 cd9660_lease_check lease_check
-#else
-#define	 cd9660_lease_check ((int (*) __P((struct vop_lease_args *)))nullop)
-#endif
-#define cd9660_poll vop_nopoll
-#define cd9660_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
-#define cd9660_remove \
-	((int (*) __P((struct  vop_remove_args *)))eopnotsupp)
-#define cd9660_link ((int (*) __P((struct  vop_link_args *)))eopnotsupp)
-#define cd9660_rename \
-	((int (*) __P((struct  vop_rename_args *)))eopnotsupp)
-#define cd9660_mkdir ((int (*) __P((struct  vop_mkdir_args *)))eopnotsupp)
-#define cd9660_rmdir ((int (*) __P((struct  vop_rmdir_args *)))eopnotsupp)
-#define cd9660_symlink \
-	((int (*) __P((struct vop_symlink_args *)))eopnotsupp)
-#define cd9660_advlock \
-	((int (*) __P((struct vop_advlock_args *)))eopnotsupp)
-#define cd9660_valloc ((int(*) __P(( \
-		struct vnode *pvp, \
-		int mode, \
-		struct ucred *cred, \
-		struct vnode **vpp))) eopnotsupp)
-#define cd9660_vfree ((int (*) __P((struct  vop_vfree_args *)))eopnotsupp)
-#define cd9660_truncate \
-	((int (*) __P((struct  vop_truncate_args *)))eopnotsupp)
-#define cd9660_update \
-	((int (*) __P((struct  vop_update_args *)))eopnotsupp)
-#define cd9660_bwrite \
-	((int (*) __P((struct  vop_bwrite_args *)))eopnotsupp)
-
-/*
  * Global vfs data structures for cd9660
  */
 vop_t **cd9660_vnodeop_p;
@@ -998,47 +960,28 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
 	{ &vop_abortop_desc,		(vop_t *) cd9660_abortop },
 	{ &vop_access_desc,		(vop_t *) cd9660_access },
-	{ &vop_advlock_desc,		(vop_t *) cd9660_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) cd9660_blkatoff },
 	{ &vop_bmap_desc,		(vop_t *) cd9660_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
 	{ &vop_cachedlookup_desc,	(vop_t *) cd9660_lookup },
 	{ &vop_close_desc,		(vop_t *) cd9660_close },
-	{ &vop_create_desc,		(vop_t *) cd9660_create },
-	{ &vop_fsync_desc,		(vop_t *) cd9660_fsync },
+	{ &vop_fsync_desc,		(vop_t *) nullop },
 	{ &vop_getattr_desc,		(vop_t *) cd9660_getattr },
 	{ &vop_inactive_desc,		(vop_t *) cd9660_inactive },
 	{ &vop_ioctl_desc,		(vop_t *) cd9660_ioctl },
 	{ &vop_islocked_desc,		(vop_t *) cd9660_islocked },
-	{ &vop_lease_desc,		(vop_t *) cd9660_lease_check },
-	{ &vop_link_desc,		(vop_t *) cd9660_link },
 	{ &vop_lock_desc,		(vop_t *) cd9660_lock },
 	{ &vop_lookup_desc,		(vop_t *) vfs_cache_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) cd9660_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) cd9660_mknod },
 	{ &vop_mmap_desc,		(vop_t *) cd9660_mmap },
 	{ &vop_open_desc,		(vop_t *) cd9660_open },
 	{ &vop_pathconf_desc,		(vop_t *) cd9660_pathconf },
-	{ &vop_poll_desc,		(vop_t *) cd9660_poll },
 	{ &vop_print_desc,		(vop_t *) cd9660_print },
 	{ &vop_read_desc,		(vop_t *) cd9660_read },
 	{ &vop_readdir_desc,		(vop_t *) cd9660_readdir },
 	{ &vop_readlink_desc,		(vop_t *) cd9660_readlink },
 	{ &vop_reclaim_desc,		(vop_t *) cd9660_reclaim },
-	{ &vop_remove_desc,		(vop_t *) cd9660_remove },
-	{ &vop_rename_desc,		(vop_t *) cd9660_rename },
-	{ &vop_revoke_desc,		(vop_t *) cd9660_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) cd9660_rmdir },
 	{ &vop_seek_desc,		(vop_t *) cd9660_seek },
 	{ &vop_setattr_desc,		(vop_t *) cd9660_setattr },
 	{ &vop_strategy_desc,		(vop_t *) cd9660_strategy },
-	{ &vop_symlink_desc,		(vop_t *) cd9660_symlink },
-	{ &vop_truncate_desc,		(vop_t *) cd9660_truncate },
 	{ &vop_unlock_desc,		(vop_t *) cd9660_unlock },
-	{ &vop_update_desc,		(vop_t *) cd9660_update },
-	{ &vop_valloc_desc,		(vop_t *) cd9660_valloc },
-	{ &vop_vfree_desc,		(vop_t *) cd9660_vfree },
-	{ &vop_write_desc,		(vop_t *) cd9660_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
@@ -1052,7 +995,6 @@ vop_t **cd9660_specop_p;
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) spec_vnoperate },
 	{ &vop_access_desc,		(vop_t *) cd9660_access },
-	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
 	{ &vop_getattr_desc,		(vop_t *) cd9660_getattr },
 	{ &vop_inactive_desc,		(vop_t *) cd9660_inactive },
 	{ &vop_islocked_desc,		(vop_t *) cd9660_islocked },
@@ -1061,7 +1003,6 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_reclaim_desc,		(vop_t *) cd9660_reclaim },
 	{ &vop_setattr_desc,		(vop_t *) cd9660_setattr },
 	{ &vop_unlock_desc,		(vop_t *) cd9660_unlock },
-	{ &vop_update_desc,		(vop_t *) cd9660_update },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_specop_opv_desc =
@@ -1072,7 +1013,6 @@ vop_t **cd9660_fifoop_p;
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) fifo_vnoperate },
 	{ &vop_access_desc,		(vop_t *) cd9660_access },
-	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
 	{ &vop_getattr_desc,		(vop_t *) cd9660_getattr },
 	{ &vop_inactive_desc,		(vop_t *) cd9660_inactive },
 	{ &vop_islocked_desc,		(vop_t *) cd9660_islocked },
@@ -1081,7 +1021,6 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_reclaim_desc,		(vop_t *) cd9660_reclaim },
 	{ &vop_setattr_desc,		(vop_t *) cd9660_setattr },
 	{ &vop_unlock_desc,		(vop_t *) cd9660_unlock },
-	{ &vop_update_desc,		(vop_t *) cd9660_update },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_fifoop_opv_desc =
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 43b531a..3c41130 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.16 1997/10/15 09:20:50 phk Exp $
+ * $Id: dead_vnops.c,v 1.17 1997/10/15 10:04:03 phk Exp $
  */
 
 #include <sys/param.h>
@@ -47,88 +47,48 @@ static int	chkvnlock __P((struct vnode *));
 static int	dead_badop __P((void));
 static int	dead_ebadf __P((void));
 static int	dead_lookup __P((struct vop_lookup_args *));
-#define dead_create ((int (*) __P((struct  vop_create_args *)))dead_badop)
-#define dead_mknod ((int (*) __P((struct  vop_mknod_args *)))dead_badop)
 static int	dead_open __P((struct vop_open_args *));
-#define dead_close ((int (*) __P((struct  vop_close_args *)))nullop)
-#define dead_access ((int (*) __P((struct  vop_access_args *)))dead_ebadf)
-#define dead_getattr ((int (*) __P((struct  vop_getattr_args *)))dead_ebadf)
-#define dead_setattr ((int (*) __P((struct  vop_setattr_args *)))dead_ebadf)
 static int	dead_read __P((struct vop_read_args *));
 static int	dead_write __P((struct vop_write_args *));
 static int	dead_ioctl __P((struct vop_ioctl_args *));
-#define dead_poll vop_nopoll
-#define dead_mmap ((int (*) __P((struct  vop_mmap_args *)))dead_badop)
-#define dead_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
-#define dead_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
-#define dead_remove ((int (*) __P((struct  vop_remove_args *)))dead_badop)
-#define dead_link ((int (*) __P((struct  vop_link_args *)))dead_badop)
-#define dead_rename ((int (*) __P((struct  vop_rename_args *)))dead_badop)
-#define dead_mkdir ((int (*) __P((struct  vop_mkdir_args *)))dead_badop)
-#define dead_rmdir ((int (*) __P((struct  vop_rmdir_args *)))dead_badop)
-#define dead_symlink ((int (*) __P((struct  vop_symlink_args *)))dead_badop)
-#define dead_readdir ((int (*) __P((struct  vop_readdir_args *)))dead_ebadf)
-#define dead_readlink ((int (*) __P((struct  vop_readlink_args *)))dead_ebadf)
-#define dead_abortop ((int (*) __P((struct  vop_abortop_args *)))dead_badop)
-#define dead_inactive ((int (*) __P((struct  vop_inactive_args *)))nullop)
-#define dead_reclaim ((int (*) __P((struct  vop_reclaim_args *)))nullop)
 static int	dead_lock __P((struct vop_lock_args *));
-#define dead_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock)
 static int	dead_bmap __P((struct vop_bmap_args *));
-static int	dead_strategy __P((struct vop_strategy_args *));
 static int	dead_print __P((struct vop_print_args *));
-#define dead_islocked ((int(*) __P((struct vop_islocked_args *)))vop_noislocked)
-#define dead_pathconf ((int (*) __P((struct  vop_pathconf_args *)))dead_ebadf)
-#define dead_advlock ((int (*) __P((struct  vop_advlock_args *)))dead_ebadf)
-#define dead_blkatoff ((int (*) __P((struct  vop_blkatoff_args *)))dead_badop)
-#define dead_valloc ((int (*) __P((struct  vop_valloc_args *)))dead_badop)
-#define dead_vfree ((int (*) __P((struct  vop_vfree_args *)))dead_badop)
-#define dead_truncate ((int (*) __P((struct  vop_truncate_args *)))nullop)
-#define dead_update ((int (*) __P((struct  vop_update_args *)))nullop)
-#define dead_bwrite ((int (*) __P((struct  vop_bwrite_args *)))nullop)
 
 vop_t **dead_vnodeop_p;
 static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) dead_abortop },
-	{ &vop_access_desc,		(vop_t *) dead_access },
-	{ &vop_advlock_desc,		(vop_t *) dead_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) dead_blkatoff },
+	{ &vop_access_desc,		(vop_t *) dead_ebadf },
+	{ &vop_advlock_desc,		(vop_t *) dead_ebadf },
 	{ &vop_bmap_desc,		(vop_t *) dead_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) dead_bwrite },
-	{ &vop_close_desc,		(vop_t *) dead_close },
-	{ &vop_create_desc,		(vop_t *) dead_create },
-	{ &vop_fsync_desc,		(vop_t *) dead_fsync },
-	{ &vop_getattr_desc,		(vop_t *) dead_getattr },
-	{ &vop_inactive_desc,		(vop_t *) dead_inactive },
+	{ &vop_close_desc,		(vop_t *) nullop },
+	{ &vop_create_desc,		(vop_t *) dead_badop },
+	{ &vop_fsync_desc,		(vop_t *) nullop },
+	{ &vop_getattr_desc,		(vop_t *) dead_ebadf },
+	{ &vop_inactive_desc,		(vop_t *) nullop },
 	{ &vop_ioctl_desc,		(vop_t *) dead_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) dead_islocked },
-	{ &vop_link_desc,		(vop_t *) dead_link },
+	{ &vop_islocked_desc,		(vop_t *) vop_noislocked },
+	{ &vop_link_desc,		(vop_t *) dead_badop },
 	{ &vop_lock_desc,		(vop_t *) dead_lock },
 	{ &vop_lookup_desc,		(vop_t *) dead_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) dead_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) dead_mknod },
-	{ &vop_mmap_desc,		(vop_t *) dead_mmap },
+	{ &vop_mkdir_desc,		(vop_t *) dead_badop },
+	{ &vop_mknod_desc,		(vop_t *) dead_badop },
+	{ &vop_mmap_desc,		(vop_t *) dead_badop },
 	{ &vop_open_desc,		(vop_t *) dead_open },
-	{ &vop_pathconf_desc,		(vop_t *) dead_pathconf },
-	{ &vop_poll_desc,		(vop_t *) dead_poll },
+	{ &vop_pathconf_desc,		(vop_t *) dead_ebadf },
 	{ &vop_print_desc,		(vop_t *) dead_print },
 	{ &vop_read_desc,		(vop_t *) dead_read },
-	{ &vop_readdir_desc,		(vop_t *) dead_readdir },
-	{ &vop_readlink_desc,		(vop_t *) dead_readlink },
-	{ &vop_reclaim_desc,		(vop_t *) dead_reclaim },
-	{ &vop_remove_desc,		(vop_t *) dead_remove },
-	{ &vop_rename_desc,		(vop_t *) dead_rename },
-	{ &vop_rmdir_desc,		(vop_t *) dead_rmdir },
-	{ &vop_seek_desc,		(vop_t *) dead_seek },
-	{ &vop_setattr_desc,		(vop_t *) dead_setattr },
-	{ &vop_strategy_desc,		(vop_t *) dead_strategy },
-	{ &vop_symlink_desc,		(vop_t *) dead_symlink },
-	{ &vop_truncate_desc,		(vop_t *) dead_truncate },
-	{ &vop_unlock_desc,		(vop_t *) dead_unlock },
-	{ &vop_update_desc,		(vop_t *) dead_update },
-	{ &vop_valloc_desc,		(vop_t *) dead_valloc },
-	{ &vop_vfree_desc,		(vop_t *) dead_vfree },
+	{ &vop_readdir_desc,		(vop_t *) dead_ebadf },
+	{ &vop_readlink_desc,		(vop_t *) dead_ebadf },
+	{ &vop_reclaim_desc,		(vop_t *) nullop },
+	{ &vop_remove_desc,		(vop_t *) dead_badop },
+	{ &vop_rename_desc,		(vop_t *) dead_badop },
+	{ &vop_rmdir_desc,		(vop_t *) dead_badop },
+	{ &vop_seek_desc,		(vop_t *) nullop },
+	{ &vop_setattr_desc,		(vop_t *) dead_ebadf },
+	{ &vop_symlink_desc,		(vop_t *) dead_badop },
+	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
+	{ &vop_update_desc,		(vop_t *) nullop },
 	{ &vop_write_desc,		(vop_t *) dead_write },
 	{ NULL, NULL }
 };
@@ -244,23 +204,6 @@ dead_ioctl(ap)
 	return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
 }
 
-/*
- * Just call the device strategy routine
- */
-static int
-dead_strategy(ap)
-	struct vop_strategy_args /* {
-		struct buf *a_bp;
-	} */ *ap;
-{
-
-	if (ap->a_bp->b_vp == NULL || !chkvnlock(ap->a_bp->b_vp)) {
-		ap->a_bp->b_flags |= B_ERROR;
-		biodone(ap->a_bp);
-		return (EIO);
-	}
-	return (VOP_STRATEGY(ap->a_bp));
-}
 
 /*
  * Wait until the vnode has finished changing state.
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index c3ac29b..7793177 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.27 1997/10/15 09:20:57 phk Exp $
+ * $Id: fdesc_vnops.c,v 1.28 1997/10/15 10:04:12 phk Exp $
  */
 
 /*
@@ -99,7 +99,6 @@ static int	fdesc_readlink __P((struct vop_readlink_args *ap));
 static int	fdesc_reclaim __P((struct vop_reclaim_args *ap));
 static int	fdesc_poll __P((struct vop_poll_args *ap));
 static int	fdesc_setattr __P((struct vop_setattr_args *ap));
-static int	fdesc_vfree __P((struct vop_vfree_args *ap));
 static int	fdesc_write __P((struct vop_write_args *ap));
 
 /*
@@ -883,19 +882,6 @@ fdesc_print(ap)
 	return (0);
 }
 
-/*void*/
-static int
-fdesc_vfree(ap)
-	struct vop_vfree_args /* {
-		struct vnode *a_pvp;
-		ino_t a_ino;
-		int a_mode;
-	} */ *ap;
-{
-
-	return (0);
-}
-
 /*
  * /dev/fd "should never get here" operation
  */
@@ -907,61 +893,18 @@ fdesc_badop()
 	/* NOTREACHED */
 }
 
-#define fdesc_create ((int (*) __P((struct  vop_create_args *)))eopnotsupp)
-#define fdesc_mknod ((int (*) __P((struct  vop_mknod_args *)))eopnotsupp)
-#define fdesc_close ((int (*) __P((struct  vop_close_args *)))nullop)
-#define fdesc_access ((int (*) __P((struct  vop_access_args *)))nullop)
-#define fdesc_mmap ((int (*) __P((struct  vop_mmap_args *)))eopnotsupp)
-#define	fdesc_revoke vop_revoke
-#define fdesc_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
-#define fdesc_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
-#define fdesc_remove ((int (*) __P((struct  vop_remove_args *)))eopnotsupp)
-#define fdesc_link ((int (*) __P((struct  vop_link_args *)))eopnotsupp)
-#define fdesc_rename ((int (*) __P((struct  vop_rename_args *)))eopnotsupp)
-#define fdesc_mkdir ((int (*) __P((struct  vop_mkdir_args *)))eopnotsupp)
-#define fdesc_rmdir ((int (*) __P((struct  vop_rmdir_args *)))eopnotsupp)
-#define fdesc_symlink ((int (*) __P((struct vop_symlink_args *)))eopnotsupp)
-#define fdesc_abortop ((int (*) __P((struct  vop_abortop_args *)))nullop)
-#define fdesc_lock ((int (*) __P((struct  vop_lock_args *)))vop_nolock)
-#define fdesc_unlock ((int (*) __P((struct  vop_unlock_args *)))vop_nounlock)
-#define fdesc_bmap ((int (*) __P((struct  vop_bmap_args *)))fdesc_badop)
-#define fdesc_strategy ((int (*) __P((struct  vop_strategy_args *)))fdesc_badop)
-#define fdesc_islocked \
-	((int (*) __P((struct vop_islocked_args *)))vop_noislocked)
-#define fdesc_advlock ((int (*) __P((struct vop_advlock_args *)))eopnotsupp)
-#define fdesc_blkatoff \
-	((int (*) __P((struct  vop_blkatoff_args *)))eopnotsupp)
-#define fdesc_valloc ((int(*) __P(( \
-		struct vnode *pvp, \
-		int mode, \
-		struct ucred *cred, \
-		struct vnode **vpp))) eopnotsupp)
-#define fdesc_truncate \
-	((int (*) __P((struct  vop_truncate_args *)))eopnotsupp)
-#define fdesc_update ((int (*) __P((struct  vop_update_args *)))eopnotsupp)
-#define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))eopnotsupp)
-
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) fdesc_abortop },
-	{ &vop_access_desc,		(vop_t *) fdesc_access },
-	{ &vop_advlock_desc,		(vop_t *) fdesc_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) fdesc_blkatoff },
-	{ &vop_bmap_desc,		(vop_t *) fdesc_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) fdesc_bwrite },
-	{ &vop_close_desc,		(vop_t *) fdesc_close },
-	{ &vop_create_desc,		(vop_t *) fdesc_create },
-	{ &vop_fsync_desc,		(vop_t *) fdesc_fsync },
+	{ &vop_access_desc,		(vop_t *) nullop },
+	{ &vop_bmap_desc,		(vop_t *) fdesc_badop },
+	{ &vop_close_desc,		(vop_t *) nullop },
+	{ &vop_fsync_desc,		(vop_t *) nullop },
 	{ &vop_getattr_desc,		(vop_t *) fdesc_getattr },
 	{ &vop_inactive_desc,		(vop_t *) fdesc_inactive },
 	{ &vop_ioctl_desc,		(vop_t *) fdesc_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) fdesc_islocked },
-	{ &vop_link_desc,		(vop_t *) fdesc_link },
-	{ &vop_lock_desc,		(vop_t *) fdesc_lock },
+	{ &vop_islocked_desc,		(vop_t *) vop_noislocked },
+	{ &vop_lock_desc,		(vop_t *) vop_nolock },
 	{ &vop_lookup_desc,		(vop_t *) fdesc_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) fdesc_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) fdesc_mknod },
-	{ &vop_mmap_desc,		(vop_t *) fdesc_mmap },
 	{ &vop_open_desc,		(vop_t *) fdesc_open },
 	{ &vop_pathconf_desc,		(vop_t *) fdesc_pathconf },
 	{ &vop_poll_desc,		(vop_t *) fdesc_poll },
@@ -970,19 +913,9 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_readdir_desc,		(vop_t *) fdesc_readdir },
 	{ &vop_readlink_desc,		(vop_t *) fdesc_readlink },
 	{ &vop_reclaim_desc,		(vop_t *) fdesc_reclaim },
-	{ &vop_remove_desc,		(vop_t *) fdesc_remove },
-	{ &vop_rename_desc,		(vop_t *) fdesc_rename },
-	{ &vop_revoke_desc,		(vop_t *) fdesc_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) fdesc_rmdir },
-	{ &vop_seek_desc,		(vop_t *) fdesc_seek },
+	{ &vop_seek_desc,		(vop_t *) nullop },
 	{ &vop_setattr_desc,		(vop_t *) fdesc_setattr },
-	{ &vop_strategy_desc,		(vop_t *) fdesc_strategy },
-	{ &vop_symlink_desc,		(vop_t *) fdesc_symlink },
-	{ &vop_truncate_desc,		(vop_t *) fdesc_truncate },
-	{ &vop_unlock_desc,		(vop_t *) fdesc_unlock },
-	{ &vop_update_desc,		(vop_t *) fdesc_update },
-	{ &vop_valloc_desc,		(vop_t *) fdesc_valloc },
-	{ &vop_vfree_desc,		(vop_t *) fdesc_vfree },
+	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
 	{ &vop_write_desc,		(vop_t *) fdesc_write },
 	{ NULL, NULL }
 };
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 7bddac3..0b157a54 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.30 1997/10/15 10:04:18 phk Exp $
+ * $Id: fifo_vnops.c,v 1.31 1997/10/15 13:23:12 phk Exp $
  */
 
 #include <sys/param.h>
@@ -82,9 +82,7 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_abortop_desc,		(vop_t *) fifo_badop },
 	{ &vop_access_desc,		(vop_t *) fifo_ebadf },
 	{ &vop_advlock_desc,		(vop_t *) fifo_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) fifo_badop },
 	{ &vop_bmap_desc,		(vop_t *) fifo_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) nullop },
 	{ &vop_close_desc,		(vop_t *) fifo_close },
 	{ &vop_create_desc,		(vop_t *) fifo_badop },
 	{ &vop_fsync_desc,		(vop_t *) nullop },
@@ -110,17 +108,12 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_reclaim_desc,		(vop_t *) nullop },
 	{ &vop_remove_desc,		(vop_t *) fifo_badop },
 	{ &vop_rename_desc,		(vop_t *) fifo_badop },
-	{ &vop_revoke_desc,		(vop_t *) vop_revoke },
 	{ &vop_rmdir_desc,		(vop_t *) fifo_badop },
 	{ &vop_seek_desc,		(vop_t *) fifo_badop },
 	{ &vop_setattr_desc,		(vop_t *) fifo_ebadf },
-	{ &vop_strategy_desc,		(vop_t *) fifo_badop },
 	{ &vop_symlink_desc,		(vop_t *) fifo_badop },
-	{ &vop_truncate_desc,		(vop_t *) fifo_badop },
 	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
 	{ &vop_update_desc,		(vop_t *) nullop },
-	{ &vop_valloc_desc,		(vop_t *) fifo_badop },
-	{ &vop_vfree_desc,		(vop_t *) fifo_badop },
 	{ &vop_write_desc,		(vop_t *) fifo_write },
 	{ NULL, NULL }
 };
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index dfb416b..6871b10 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.46 1997/10/15 09:21:39 phk Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.47 1997/10/15 10:05:03 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -1992,7 +1992,6 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_access_desc,		(vop_t *) msdosfs_access },
 	{ &vop_advlock_desc,		(vop_t *) msdosfs_advlock },
 	{ &vop_bmap_desc,		(vop_t *) msdosfs_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
 	{ &vop_cachedlookup_desc,	(vop_t *) msdosfs_lookup },
 	{ &vop_close_desc,		(vop_t *) msdosfs_close },
 	{ &vop_create_desc,		(vop_t *) msdosfs_create },
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 231b385..d8c2230 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.22 1997/10/15 09:21:11 phk Exp $
+ * $Id: portal_vnops.c,v 1.23 1997/10/15 10:04:34 phk Exp $
  */
 
 /*
@@ -78,7 +78,6 @@ static int	portal_print __P((struct vop_print_args *ap));
 static int	portal_readdir __P((struct vop_readdir_args *ap));
 static int	portal_reclaim __P((struct vop_reclaim_args *ap));
 static int	portal_setattr __P((struct vop_setattr_args *ap));
-static int	portal_vfree __P((struct vop_vfree_args *ap));
 
 static void
 portal_closefd(p, fd)
@@ -612,19 +611,6 @@ portal_print(ap)
 	return (0);
 }
 
-/*void*/
-static int
-portal_vfree(ap)
-	struct vop_vfree_args /* {
-		struct vnode *a_pvp;
-		ino_t a_ino;
-		int a_mode;
-	} */ *ap;
-{
-
-	return (0);
-}
-
 
 /*
  * Portal vnode unsupported operation
@@ -647,94 +633,26 @@ portal_badop()
 	/* NOTREACHED */
 }
 
-#define portal_create ((int (*) __P((struct vop_create_args *)))portal_enotsupp)
-#define portal_mknod ((int (*) __P((struct  vop_mknod_args *)))portal_enotsupp)
-#define portal_close ((int (*) __P((struct  vop_close_args *)))nullop)
-#define portal_access ((int (*) __P((struct  vop_access_args *)))nullop)
-#define portal_read ((int (*) __P((struct  vop_read_args *)))portal_enotsupp)
-#define portal_write ((int (*) __P((struct  vop_write_args *)))portal_enotsupp)
-#define portal_ioctl ((int (*) __P((struct  vop_ioctl_args *)))portal_enotsupp)
-#define portal_mmap ((int (*) __P((struct  vop_mmap_args *)))portal_enotsupp)
-#define	portal_poll vop_nopoll
-#define	portal_revoke vop_revoke
-#define portal_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
-#define portal_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
-#define portal_remove ((int (*) __P((struct vop_remove_args *)))portal_enotsupp)
-#define portal_link ((int (*) __P((struct  vop_link_args *)))portal_enotsupp)
-#define portal_rename ((int (*) __P((struct vop_rename_args *)))portal_enotsupp)
-#define portal_mkdir ((int (*) __P((struct  vop_mkdir_args *)))portal_enotsupp)
-#define portal_rmdir ((int (*) __P((struct  vop_rmdir_args *)))portal_enotsupp)
-#define portal_symlink \
-	((int (*) __P((struct  vop_symlink_args *)))portal_enotsupp)
-#define portal_readlink \
-	((int (*) __P((struct  vop_readlink_args *)))portal_enotsupp)
-#define portal_abortop ((int (*) __P((struct  vop_abortop_args *)))nullop)
-#define portal_lock ((int (*) __P((struct  vop_lock_args *)))vop_nolock)
-#define portal_unlock ((int (*) __P((struct  vop_unlock_args *)))vop_nounlock)
-#define portal_bmap ((int (*) __P((struct  vop_bmap_args *)))portal_badop)
-#define portal_strategy \
-	((int (*) __P((struct  vop_strategy_args *)))portal_badop)
-#define portal_islocked \
-	((int (*) __P((struct vop_islocked_args *)))vop_noislocked)
-#define fifo_islocked ((int(*) __P((struct vop_islocked_args *)))vop_noislocked)
-#define portal_advlock \
-	((int (*) __P((struct  vop_advlock_args *)))portal_enotsupp)
-#define portal_blkatoff \
-	((int (*) __P((struct  vop_blkatoff_args *)))portal_enotsupp)
-#define portal_valloc ((int(*) __P(( \
-		struct vnode *pvp, \
-		int mode, \
-		struct ucred *cred, \
-		struct vnode **vpp))) portal_enotsupp)
-#define portal_truncate \
-	((int (*) __P((struct  vop_truncate_args *)))portal_enotsupp)
-#define portal_update ((int (*) __P((struct vop_update_args *)))portal_enotsupp)
-#define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp)
-
 vop_t **portal_vnodeop_p;
 static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) portal_abortop },
-	{ &vop_access_desc,		(vop_t *) portal_access },
-	{ &vop_advlock_desc,		(vop_t *) portal_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) portal_blkatoff },
-	{ &vop_bmap_desc,		(vop_t *) portal_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) portal_bwrite },
-	{ &vop_close_desc,		(vop_t *) portal_close },
-	{ &vop_create_desc,		(vop_t *) portal_create },
-	{ &vop_fsync_desc,		(vop_t *) portal_fsync },
+	{ &vop_access_desc,		(vop_t *) nullop },
+	{ &vop_bmap_desc,		(vop_t *) portal_badop },
+	{ &vop_close_desc,		(vop_t *) nullop },
+	{ &vop_fsync_desc,		(vop_t *) nullop },
 	{ &vop_getattr_desc,		(vop_t *) portal_getattr },
 	{ &vop_inactive_desc,		(vop_t *) portal_inactive },
-	{ &vop_ioctl_desc,		(vop_t *) portal_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) portal_islocked },
-	{ &vop_link_desc,		(vop_t *) portal_link },
-	{ &vop_lock_desc,		(vop_t *) portal_lock },
+	{ &vop_islocked_desc,		(vop_t *) vop_noislocked },
+	{ &vop_lock_desc,		(vop_t *) vop_nolock },
 	{ &vop_lookup_desc,		(vop_t *) portal_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) portal_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) portal_mknod },
-	{ &vop_mmap_desc,		(vop_t *) portal_mmap },
 	{ &vop_open_desc,		(vop_t *) portal_open },
 	{ &vop_pathconf_desc,		(vop_t *) portal_pathconf },
-	{ &vop_poll_desc,		(vop_t *) portal_poll },
 	{ &vop_print_desc,		(vop_t *) portal_print },
-	{ &vop_read_desc,		(vop_t *) portal_read },
 	{ &vop_readdir_desc,		(vop_t *) portal_readdir },
-	{ &vop_readlink_desc,		(vop_t *) portal_readlink },
 	{ &vop_reclaim_desc,		(vop_t *) portal_reclaim },
-	{ &vop_remove_desc,		(vop_t *) portal_remove },
-	{ &vop_rename_desc,		(vop_t *) portal_rename },
-	{ &vop_revoke_desc,		(vop_t *) portal_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) portal_rmdir },
-	{ &vop_seek_desc,		(vop_t *) portal_seek },
+	{ &vop_seek_desc,		(vop_t *) nullop },
 	{ &vop_setattr_desc,		(vop_t *) portal_setattr },
-	{ &vop_strategy_desc,		(vop_t *) portal_strategy },
-	{ &vop_symlink_desc,		(vop_t *) portal_symlink },
-	{ &vop_truncate_desc,		(vop_t *) portal_truncate },
-	{ &vop_unlock_desc,		(vop_t *) portal_unlock },
-	{ &vop_update_desc,		(vop_t *) portal_update },
-	{ &vop_valloc_desc,		(vop_t *) portal_valloc },
-	{ &vop_vfree_desc,		(vop_t *) portal_vfree },
-	{ &vop_write_desc,		(vop_t *) portal_write },
+	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc portal_vnodeop_opv_desc =
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 443d89f..ab62a4d 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.34 1997/10/15 09:21:19 phk Exp $
+ *	$Id: procfs_vnops.c,v 1.35 1997/10/15 10:04:38 phk Exp $
  */
 
 /*
@@ -936,33 +936,6 @@ atopid(b, len)
 	return (p);
 }
 
-#define procfs_create ((int (*) __P((struct vop_create_args *))) procfs_badop)
-#define procfs_mknod ((int (*) __P((struct vop_mknod_args *))) procfs_badop)
-#define	procfs_read procfs_rw
-#define	procfs_write procfs_rw
-#define procfs_mmap ((int (*) __P((struct vop_mmap_args *))) procfs_badop)
-#define procfs_poll vop_nopoll
-#define procfs_revoke vop_revoke
-#define procfs_fsync ((int (*) __P((struct vop_fsync_args *))) procfs_badop)
-#define procfs_seek ((int (*) __P((struct vop_seek_args *))) procfs_badop)
-#define procfs_remove ((int (*) __P((struct vop_remove_args *))) procfs_badop)
-#define procfs_link ((int (*) __P((struct vop_link_args *))) procfs_badop)
-#define procfs_rename ((int (*) __P((struct vop_rename_args *))) procfs_badop)
-#define procfs_mkdir ((int (*) __P((struct vop_mkdir_args *))) procfs_badop)
-#define procfs_rmdir ((int (*) __P((struct vop_rmdir_args *))) procfs_badop)
-#define procfs_symlink ((int (*) __P((struct vop_symlink_args *))) procfs_badop)
-#define procfs_lock ((int (*) __P((struct vop_lock_args *)))vop_nolock)
-#define procfs_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock)
-#define	procfs_strategy ((int (*) __P((struct vop_strategy_args *))) procfs_badop)
-#define procfs_islocked \
-	((int (*) __P((struct vop_islocked_args *)))vop_noislocked)
-#define procfs_advlock ((int (*) __P((struct vop_advlock_args *))) procfs_badop)
-#define procfs_blkatoff ((int (*) __P((struct vop_blkatoff_args *))) procfs_badop)
-#define procfs_valloc ((int (*) __P((struct vop_valloc_args *))) procfs_badop)
-#define procfs_vfree ((int (*) __P((struct vop_vfree_args *))) nullop)
-#define procfs_truncate ((int (*) __P((struct vop_truncate_args *))) procfs_badop)
-#define procfs_update ((int (*) __P((struct vop_update_args *))) nullop)
-
 /*
  * procfs vnode operations.
  */
@@ -971,44 +944,36 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
 	{ &vop_abortop_desc,		(vop_t *) procfs_abortop },
 	{ &vop_access_desc,		(vop_t *) procfs_access },
-	{ &vop_advlock_desc,		(vop_t *) procfs_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) procfs_blkatoff },
+	{ &vop_advlock_desc,		(vop_t *) procfs_badop },
 	{ &vop_bmap_desc,		(vop_t *) procfs_bmap },
 	{ &vop_close_desc,		(vop_t *) procfs_close },
-	{ &vop_create_desc,		(vop_t *) procfs_create },
-	{ &vop_fsync_desc,		(vop_t *) procfs_fsync },
+	{ &vop_create_desc,		(vop_t *) procfs_badop },
 	{ &vop_getattr_desc,		(vop_t *) procfs_getattr },
 	{ &vop_inactive_desc,		(vop_t *) procfs_inactive },
 	{ &vop_ioctl_desc,		(vop_t *) procfs_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) procfs_islocked },
-	{ &vop_link_desc,		(vop_t *) procfs_link },
-	{ &vop_lock_desc,		(vop_t *) procfs_lock },
+	{ &vop_islocked_desc,		(vop_t *) vop_noislocked },
+	{ &vop_link_desc,		(vop_t *) procfs_badop },
+	{ &vop_lock_desc,		(vop_t *) vop_nolock },
 	{ &vop_lookup_desc,		(vop_t *) procfs_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) procfs_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) procfs_mknod },
-	{ &vop_mmap_desc,		(vop_t *) procfs_mmap },
+	{ &vop_mkdir_desc,		(vop_t *) procfs_badop },
+	{ &vop_mknod_desc,		(vop_t *) procfs_badop },
+	{ &vop_mmap_desc,		(vop_t *) procfs_badop },
 	{ &vop_open_desc,		(vop_t *) procfs_open },
 	{ &vop_pathconf_desc,		(vop_t *) procfs_pathconf },
-	{ &vop_poll_desc,		(vop_t *) procfs_poll },
 	{ &vop_print_desc,		(vop_t *) procfs_print },
-	{ &vop_read_desc,		(vop_t *) procfs_read },
+	{ &vop_read_desc,		(vop_t *) procfs_rw },
 	{ &vop_readdir_desc,		(vop_t *) procfs_readdir },
 	{ &vop_readlink_desc,		(vop_t *) procfs_readlink },
 	{ &vop_reclaim_desc,		(vop_t *) procfs_reclaim },
-	{ &vop_remove_desc,		(vop_t *) procfs_remove },
-	{ &vop_rename_desc,		(vop_t *) procfs_rename },
-	{ &vop_revoke_desc,		(vop_t *) procfs_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) procfs_rmdir },
-	{ &vop_seek_desc,		(vop_t *) procfs_seek },
+	{ &vop_remove_desc,		(vop_t *) procfs_badop },
+	{ &vop_rename_desc,		(vop_t *) procfs_badop },
+	{ &vop_rmdir_desc,		(vop_t *) procfs_badop },
+	{ &vop_seek_desc,		(vop_t *) procfs_badop },
 	{ &vop_setattr_desc,		(vop_t *) procfs_setattr },
-	{ &vop_strategy_desc,		(vop_t *) procfs_strategy },
-	{ &vop_symlink_desc,		(vop_t *) procfs_symlink },
-	{ &vop_truncate_desc,		(vop_t *) procfs_truncate },
-	{ &vop_unlock_desc,		(vop_t *) procfs_unlock },
-	{ &vop_update_desc,		(vop_t *) procfs_update },
-	{ &vop_valloc_desc,		(vop_t *) procfs_valloc },
-	{ &vop_vfree_desc,		(vop_t *) procfs_vfree },
-	{ &vop_write_desc,		(vop_t *) procfs_write },
+	{ &vop_symlink_desc,		(vop_t *) procfs_badop },
+	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
+	{ &vop_update_desc,		(vop_t *) nullop },
+	{ &vop_write_desc,		(vop_t *) procfs_rw },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc procfs_vnodeop_opv_desc =
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 73361c2..12a9f29 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.45 1997/10/15 10:04:43 phk Exp $
+ * $Id: spec_vnops.c,v 1.46 1997/10/15 13:23:18 phk Exp $
  */
 
 #include <sys/param.h>
@@ -81,12 +81,9 @@ struct vnode *speclisth[SPECHSZ];
 vop_t **spec_vnodeop_p;
 static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) spec_badop },
 	{ &vop_access_desc,		(vop_t *) spec_ebadf },
 	{ &vop_advlock_desc,		(vop_t *) spec_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) spec_badop },
 	{ &vop_bmap_desc,		(vop_t *) spec_bmap },
-	{ &vop_bwrite_desc,		(vop_t *) nullop },
 	{ &vop_close_desc,		(vop_t *) spec_close },
 	{ &vop_create_desc,		(vop_t *) spec_badop },
 	{ &vop_fsync_desc,		(vop_t *) spec_fsync },
@@ -113,17 +110,13 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_reclaim_desc,		(vop_t *) nullop },
 	{ &vop_remove_desc,		(vop_t *) spec_badop },
 	{ &vop_rename_desc,		(vop_t *) spec_badop },
-	{ &vop_revoke_desc,		(vop_t *) vop_revoke },
 	{ &vop_rmdir_desc,		(vop_t *) spec_badop },
 	{ &vop_seek_desc,		(vop_t *) spec_badop },
 	{ &vop_setattr_desc,		(vop_t *) spec_ebadf },
 	{ &vop_strategy_desc,		(vop_t *) spec_strategy },
 	{ &vop_symlink_desc,		(vop_t *) spec_badop },
-	{ &vop_truncate_desc,		(vop_t *) nullop },
 	{ &vop_unlock_desc,		(vop_t *) vop_nounlock },
 	{ &vop_update_desc,		(vop_t *) nullop },
-	{ &vop_valloc_desc,		(vop_t *) spec_badop },
-	{ &vop_vfree_desc,		(vop_t *) spec_badop },
 	{ &vop_write_desc,		(vop_t *) spec_write },
 	{ NULL, NULL }
 };
@@ -480,7 +473,7 @@ spec_poll(ap)
 		dev = ap->a_vp->v_rdev;
 		return (*cdevsw[major(dev)]->d_poll)(dev, ap->a_events, ap->a_p);
 	default:
-		return (vop_nopoll(ap));
+		return (vn_defaultop((struct vop_generic_args *)ap));
 
 	}
 }