Stylistic overhaul of vnops tables.

        1. Remove comment stating the blatantly obvious.
        2. Align in two columns.
        3. Sort all but the default element alphabetically.
        4. Remove XXX comments pointing out entries not needed.

11 files changed, 493 insertions, 567 deletions

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index cddb6fd..74d68b8 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.39 1997/09/21 04:22:40 dyson Exp $
+ * $Id: cd9660_vnops.c,v 1.40 1997/09/27 13:38:51 kato Exp $
  */
 
 #include <sys/param.h>
@@ -995,55 +995,50 @@ cd9660_pathconf(ap)
  */
 vop_t **cd9660_vnodeop_p;
 struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
-
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
-	{ &vop_cachedlookup_desc, (vop_t *)cd9660_lookup },	/* lookup */
-	{ &vop_create_desc, (vop_t *)cd9660_create },	/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)cd9660_open },	/* open */
-	{ &vop_close_desc, (vop_t *)cd9660_close },	/* close */
-	{ &vop_access_desc, (vop_t *)cd9660_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)cd9660_read },	/* read */
-	{ &vop_write_desc, (vop_t *)cd9660_write },	/* write */
-	{ &vop_lease_desc, (vop_t *)cd9660_lease_check },/* lease */
-	{ &vop_ioctl_desc, (vop_t *)cd9660_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)cd9660_poll },	/* poll */
-	{ &vop_revoke_desc, (vop_t *)cd9660_revoke },	/* revoke */
-	{ &vop_mmap_desc, (vop_t *)cd9660_mmap },	/* mmap */
-	{ &vop_fsync_desc, (vop_t *)cd9660_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)cd9660_seek },	/* seek */
-	{ &vop_remove_desc, (vop_t *)cd9660_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)cd9660_link },	/* link */
-	{ &vop_rename_desc, (vop_t *)cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)cd9660_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)cd9660_readlink },/* readlink */
-	{ &vop_abortop_desc, (vop_t *)cd9660_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)cd9660_bmap },	/* bmap */
-	{ &vop_strategy_desc, (vop_t *)cd9660_strategy },/* strategy */
-	{ &vop_print_desc, (vop_t *)cd9660_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)cd9660_pathconf },/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)cd9660_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)cd9660_valloc },	/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },/* truncate */
-	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
+	{ &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_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 =
@@ -1055,54 +1050,49 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc);
  */
 vop_t **cd9660_specop_p;
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
-	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
-	{ &vop_access_desc, (vop_t *)cd9660_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)spec_read },		/* read */
-	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
-	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
-	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
-	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)spec_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)spec_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)spec_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)spec_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)spec_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)spec_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)spec_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)cd9660_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) spec_abortop },
+	{ &vop_access_desc,		(vop_t *) cd9660_access },
+	{ &vop_advlock_desc,		(vop_t *) spec_advlock },
+	{ &vop_blkatoff_desc,	(vop_t *) spec_blkatoff },
+	{ &vop_bmap_desc,		(vop_t *) spec_bmap },
+	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
+	{ &vop_close_desc,		(vop_t *) spec_close },
+	{ &vop_create_desc,		(vop_t *) spec_create },
+	{ &vop_fsync_desc,		(vop_t *) spec_fsync },
+	{ &vop_getattr_desc,		(vop_t *) cd9660_getattr },
+	{ &vop_inactive_desc,	(vop_t *) cd9660_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) spec_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) cd9660_islocked },
+	{ &vop_lease_desc,		(vop_t *) spec_lease_check },
+	{ &vop_link_desc,		(vop_t *) spec_link },
+	{ &vop_lock_desc,		(vop_t *) cd9660_lock },
+	{ &vop_lookup_desc,		(vop_t *) spec_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) spec_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) spec_mknod },
+	{ &vop_mmap_desc,		(vop_t *) spec_mmap },
+	{ &vop_open_desc,		(vop_t *) spec_open },
+	{ &vop_pathconf_desc,	(vop_t *) spec_pathconf },
+	{ &vop_poll_desc,		(vop_t *) spec_poll },
+	{ &vop_print_desc,		(vop_t *) cd9660_print },
+	{ &vop_read_desc,		(vop_t *) spec_read },
+	{ &vop_readdir_desc,		(vop_t *) spec_readdir },
+	{ &vop_readlink_desc,	(vop_t *) spec_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) cd9660_reclaim },
+	{ &vop_remove_desc,		(vop_t *) spec_remove },
+	{ &vop_rename_desc,		(vop_t *) spec_rename },
+	{ &vop_revoke_desc,		(vop_t *) spec_revoke },
+	{ &vop_rmdir_desc,		(vop_t *) spec_rmdir },
+	{ &vop_seek_desc,		(vop_t *) spec_seek },
+	{ &vop_setattr_desc,		(vop_t *) cd9660_setattr },
+	{ &vop_strategy_desc,	(vop_t *) spec_strategy },
+	{ &vop_symlink_desc,		(vop_t *) spec_symlink },
+	{ &vop_truncate_desc,	(vop_t *) spec_truncate },
+	{ &vop_unlock_desc,		(vop_t *) cd9660_unlock },
+	{ &vop_update_desc,		(vop_t *) cd9660_update },
+	{ &vop_valloc_desc,		(vop_t *) spec_valloc },
+	{ &vop_vfree_desc,		(vop_t *) spec_vfree },
+	{ &vop_write_desc,		(vop_t *) spec_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_specop_opv_desc =
@@ -1111,54 +1101,49 @@ VNODEOP_SET(cd9660_specop_opv_desc);
 
 vop_t **cd9660_fifoop_p;
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
-	{ &vop_close_desc, (vop_t *)fifo_close },	/* close */
-	{ &vop_access_desc, (vop_t *)cd9660_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)fifo_read },		/* read */
-	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
-	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
-	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
-	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)fifo_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)fifo_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)fifo_link }	,	/* link */
-	{ &vop_rename_desc, (vop_t *)fifo_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)fifo_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)fifo_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)fifo_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, (vop_t *)cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)cd9660_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)fifo_valloc },	/* valloc */
-/* XXX: vop_reallocpages */
-	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) fifo_abortop },
+	{ &vop_access_desc,		(vop_t *) cd9660_access },
+	{ &vop_advlock_desc,		(vop_t *) fifo_advlock },
+	{ &vop_blkatoff_desc,	(vop_t *) fifo_blkatoff },
+	{ &vop_bmap_desc,		(vop_t *) fifo_bmap },
+	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
+	{ &vop_close_desc,		(vop_t *) fifo_close },
+	{ &vop_create_desc,		(vop_t *) fifo_create },
+	{ &vop_fsync_desc,		(vop_t *) fifo_fsync },
+	{ &vop_getattr_desc,		(vop_t *) cd9660_getattr },
+	{ &vop_inactive_desc,	(vop_t *) cd9660_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) fifo_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) cd9660_islocked },
+	{ &vop_lease_desc,		(vop_t *) fifo_lease_check },
+	{ &vop_link_desc,		(vop_t *) fifo_link },
+	{ &vop_lock_desc,		(vop_t *) cd9660_lock },
+	{ &vop_lookup_desc,		(vop_t *) fifo_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) fifo_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) fifo_mknod },
+	{ &vop_mmap_desc,		(vop_t *) fifo_mmap },
+	{ &vop_open_desc,		(vop_t *) fifo_open },
+	{ &vop_pathconf_desc,	(vop_t *) fifo_pathconf },
+	{ &vop_poll_desc,		(vop_t *) fifo_poll },
+	{ &vop_print_desc,		(vop_t *) cd9660_print },
+	{ &vop_read_desc,		(vop_t *) fifo_read },
+	{ &vop_readdir_desc,		(vop_t *) fifo_readdir },
+	{ &vop_readlink_desc,	(vop_t *) fifo_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) cd9660_reclaim },
+	{ &vop_remove_desc,		(vop_t *) fifo_remove },
+	{ &vop_rename_desc,		(vop_t *) fifo_rename },
+	{ &vop_revoke_desc,		(vop_t *) fifo_revoke },
+	{ &vop_rmdir_desc,		(vop_t *) fifo_rmdir },
+	{ &vop_seek_desc,		(vop_t *) fifo_seek },
+	{ &vop_setattr_desc,		(vop_t *) cd9660_setattr },
+	{ &vop_strategy_desc,	(vop_t *) fifo_strategy },
+	{ &vop_symlink_desc,		(vop_t *) fifo_symlink },
+	{ &vop_truncate_desc,	(vop_t *) fifo_truncate },
+	{ &vop_unlock_desc,		(vop_t *) cd9660_unlock },
+	{ &vop_update_desc,		(vop_t *) cd9660_update },
+	{ &vop_valloc_desc,		(vop_t *) fifo_valloc },
+	{ &vop_vfree_desc,		(vop_t *) fifo_vfree },
+	{ &vop_write_desc,		(vop_t *) fifo_write },
 	{ 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 a8856f9..d4bb0ae 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.14 1997/09/02 20:06:08 bde Exp $
+ * $Id: dead_vnops.c,v 1.15 1997/09/14 02:57:46 peter Exp $
  */
 
 #include <sys/param.h>
@@ -89,54 +89,47 @@ static int	dead_print __P((struct vop_print_args *));
 
 vop_t **dead_vnodeop_p;
 static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)dead_lookup },	/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)dead_create },	/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)dead_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)dead_open },		/* open */
-	{ &vop_close_desc, (vop_t *)dead_close },	/* close */
-	{ &vop_access_desc, (vop_t *)dead_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)dead_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)dead_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)dead_read },		/* read */
-	{ &vop_write_desc, (vop_t *)dead_write },	/* write */
-/* XXX: vop_lease */
-	{ &vop_ioctl_desc, (vop_t *)dead_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)dead_poll },		/* poll */
-/* XXX: vop_revoke */
-	{ &vop_mmap_desc, (vop_t *)dead_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)dead_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)dead_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)dead_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)dead_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)dead_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)dead_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)dead_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)dead_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)dead_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)dead_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)dead_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)dead_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)dead_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)dead_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)dead_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)dead_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)dead_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)dead_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)dead_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)dead_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)dead_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)dead_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)dead_valloc },	/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)dead_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)dead_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)dead_update },	/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)dead_bwrite },	/* bwrite */
+	{ &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_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_ioctl_desc,		(vop_t *) dead_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) dead_islocked },
+	{ &vop_link_desc,		(vop_t *) dead_link },
+	{ &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_open_desc,		(vop_t *) dead_open },
+	{ &vop_pathconf_desc,	(vop_t *) dead_pathconf },
+	{ &vop_poll_desc,		(vop_t *) dead_poll },
+	{ &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_write_desc,		(vop_t *) dead_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc dead_vnodeop_opv_desc =
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index f63bd1b..dca208e 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.25 1997/09/07 05:25:53 bde Exp $
+ * $Id: fdesc_vnops.c,v 1.26 1997/09/14 02:57:50 peter Exp $
  */
 
 /*
@@ -942,54 +942,48 @@ fdesc_badop()
 #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_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)fdesc_create },		/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)fdesc_mknod },		/* mknod */
-	{ &vop_open_desc, (vop_t *)fdesc_open },		/* open */
-	{ &vop_close_desc, (vop_t *)fdesc_close },		/* close */
-	{ &vop_access_desc, (vop_t *)fdesc_access },		/* access */
-	{ &vop_getattr_desc, (vop_t *)fdesc_getattr },		/* getattr */
-	{ &vop_setattr_desc, (vop_t *)fdesc_setattr },		/* setattr */
-	{ &vop_read_desc, (vop_t *)fdesc_read },		/* read */
-/* XXX: vop_lease */
-	{ &vop_write_desc, (vop_t *)fdesc_write },		/* write */
-	{ &vop_ioctl_desc, (vop_t *)fdesc_ioctl },		/* ioctl */
-	{ &vop_poll_desc, (vop_t *)fdesc_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)fdesc_revoke },		/* revoke */
-	{ &vop_mmap_desc, (vop_t *)fdesc_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)fdesc_fsync },		/* fsync */
-	{ &vop_seek_desc, (vop_t *)fdesc_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)fdesc_remove },		/* remove */
-	{ &vop_link_desc, (vop_t *)fdesc_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)fdesc_rename },		/* rename */
-	{ &vop_mkdir_desc, (vop_t *)fdesc_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)fdesc_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)fdesc_symlink },		/* symlink */
-	{ &vop_readdir_desc, (vop_t *)fdesc_readdir },		/* readdir */
-	{ &vop_readlink_desc, (vop_t *)fdesc_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)fdesc_abortop },		/* abortop */
-	{ &vop_inactive_desc, (vop_t *)fdesc_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)fdesc_reclaim },		/* reclaim */
-	{ &vop_lock_desc, (vop_t *)fdesc_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)fdesc_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *)fdesc_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)fdesc_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)fdesc_print },		/* print */
-	{ &vop_islocked_desc, (vop_t *)fdesc_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)fdesc_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)fdesc_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)fdesc_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)fdesc_valloc },		/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)fdesc_vfree },		/* vfree */
-	{ &vop_truncate_desc, (vop_t *)fdesc_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)fdesc_update },		/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)fdesc_bwrite },		/* bwrite */
+	{ &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_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_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 },
+	{ &vop_print_desc,		(vop_t *) fdesc_print },
+	{ &vop_read_desc,		(vop_t *) fdesc_read },
+	{ &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_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_write_desc,		(vop_t *) fdesc_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc fdesc_vnodeop_opv_desc =
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 27553a9..1cb11d7 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.27 1997/09/14 02:57:53 peter Exp $
+ * $Id: fifo_vnops.c,v 1.28 1997/10/12 20:24:42 phk Exp $
  */
 
 #include <sys/param.h>
@@ -65,50 +65,49 @@ static int	fifo_print __P((struct vop_print_args *));
 
 vop_t **fifo_vnodeop_p;
 static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
-	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
-	{ &vop_close_desc, (vop_t *)fifo_close },	/* close */
-	{ &vop_access_desc, (vop_t *)fifo_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)fifo_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)fifo_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)fifo_read },		/* read */
-	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
-	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
-	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
-	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)fifo_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)fifo_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)fifo_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)fifo_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)fifo_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)fifo_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)fifo_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)fifo_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)fifo_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)fifo_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)fifo_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)fifo_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)fifo_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)fifo_valloc },	/* valloc */
-	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)fifo_update },	/* update */
-	{ &vop_bwrite_desc, (vop_t *)fifo_bwrite },	/* bwrite */
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) fifo_abortop },
+	{ &vop_access_desc,		(vop_t *) fifo_access },
+	{ &vop_advlock_desc,		(vop_t *) fifo_advlock },
+	{ &vop_blkatoff_desc,	(vop_t *) fifo_blkatoff },
+	{ &vop_bmap_desc,		(vop_t *) fifo_bmap },
+	{ &vop_bwrite_desc,		(vop_t *) fifo_bwrite },
+	{ &vop_close_desc,		(vop_t *) fifo_close },
+	{ &vop_create_desc,		(vop_t *) fifo_create },
+	{ &vop_fsync_desc,		(vop_t *) fifo_fsync },
+	{ &vop_getattr_desc,		(vop_t *) fifo_getattr },
+	{ &vop_inactive_desc,	(vop_t *) fifo_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) fifo_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) fifo_islocked },
+	{ &vop_lease_desc,		(vop_t *) fifo_lease_check },
+	{ &vop_link_desc,		(vop_t *) fifo_link },
+	{ &vop_lock_desc,		(vop_t *) fifo_lock },
+	{ &vop_lookup_desc,		(vop_t *) fifo_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) fifo_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) fifo_mknod },
+	{ &vop_mmap_desc,		(vop_t *) fifo_mmap },
+	{ &vop_open_desc,		(vop_t *) fifo_open },
+	{ &vop_pathconf_desc,	(vop_t *) fifo_pathconf },
+	{ &vop_poll_desc,		(vop_t *) fifo_poll },
+	{ &vop_print_desc,		(vop_t *) fifo_print },
+	{ &vop_read_desc,		(vop_t *) fifo_read },
+	{ &vop_readdir_desc,		(vop_t *) fifo_readdir },
+	{ &vop_readlink_desc,	(vop_t *) fifo_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) fifo_reclaim },
+	{ &vop_remove_desc,		(vop_t *) fifo_remove },
+	{ &vop_rename_desc,		(vop_t *) fifo_rename },
+	{ &vop_revoke_desc,		(vop_t *) fifo_revoke },
+	{ &vop_rmdir_desc,		(vop_t *) fifo_rmdir },
+	{ &vop_seek_desc,		(vop_t *) fifo_seek },
+	{ &vop_setattr_desc,		(vop_t *) fifo_setattr },
+	{ &vop_strategy_desc,	(vop_t *) fifo_strategy },
+	{ &vop_symlink_desc,		(vop_t *) fifo_symlink },
+	{ &vop_truncate_desc,	(vop_t *) fifo_truncate },
+	{ &vop_unlock_desc,		(vop_t *) fifo_unlock },
+	{ &vop_update_desc,		(vop_t *) fifo_update },
+	{ &vop_valloc_desc,		(vop_t *) fifo_valloc },
+	{ &vop_vfree_desc,		(vop_t *) fifo_vfree },
+	{ &vop_write_desc,		(vop_t *) fifo_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc fifo_vnodeop_opv_desc =
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 8d9bfc5..5938775 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.44 1997/09/14 02:57:44 peter Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.45 1997/09/21 04:23:39 dyson Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -1987,54 +1987,44 @@ msdosfs_pathconf(ap)
 /* Global vfs data structures for msdosfs */
 vop_t **msdosfs_vnodeop_p;
 static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
-	{ &vop_cachedlookup_desc, (vop_t *)msdosfs_lookup },	/* lookup */
-	{ &vop_create_desc, (vop_t *)msdosfs_create },		/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)msdosfs_mknod },		/* mknod */
-	{ &vop_open_desc, (vop_t *)msdosfs_open },		/* open */
-	{ &vop_close_desc, (vop_t *)msdosfs_close },		/* close */
-	{ &vop_access_desc, (vop_t *)msdosfs_access },		/* access */
-	{ &vop_getattr_desc, (vop_t *)msdosfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)msdosfs_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)msdosfs_read },		/* read */
-	{ &vop_write_desc, (vop_t *)msdosfs_write },		/* write */
-/* XXX: vop_lease */
-	{ &vop_ioctl_desc, (vop_t *)msdosfs_ioctl },		/* ioctl */
-	{ &vop_poll_desc, (vop_t *)msdosfs_poll },		/* poll */
-/* XXX: vop_revoke */
-	{ &vop_mmap_desc, (vop_t *)msdosfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)msdosfs_fsync },		/* fsync */
-	{ &vop_seek_desc, (vop_t *)msdosfs_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)msdosfs_remove },		/* remove */
-	{ &vop_link_desc, (vop_t *)msdosfs_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)msdosfs_rename },		/* rename */
-	{ &vop_mkdir_desc, (vop_t *)msdosfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)msdosfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)msdosfs_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)msdosfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)msdosfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)msdosfs_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)msdosfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)msdosfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)msdosfs_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)msdosfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *)msdosfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)msdosfs_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)msdosfs_print },		/* print */
-	{ &vop_islocked_desc, (vop_t *)msdosfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)msdosfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)msdosfs_advlock },	/* advlock */
-/* XXX: vop_blkatoff */
-/* XXX: vop_valloc */
-	{ &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks },	/* reallocblks */
-/* XXX: vop_vfree */
-/* XXX: vop_truncate */
-/* XXX: vop_update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) msdosfs_abortop },
+	{ &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 },
+	{ &vop_fsync_desc,		(vop_t *) msdosfs_fsync },
+	{ &vop_getattr_desc,		(vop_t *) msdosfs_getattr },
+	{ &vop_inactive_desc,	(vop_t *) msdosfs_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) msdosfs_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) msdosfs_islocked },
+	{ &vop_link_desc,		(vop_t *) msdosfs_link },
+	{ &vop_lock_desc,		(vop_t *) msdosfs_lock },
+	{ &vop_lookup_desc,		(vop_t *) vfs_cache_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) msdosfs_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) msdosfs_mknod },
+	{ &vop_mmap_desc,		(vop_t *) msdosfs_mmap },
+	{ &vop_open_desc,		(vop_t *) msdosfs_open },
+	{ &vop_pathconf_desc,	(vop_t *) msdosfs_pathconf },
+	{ &vop_poll_desc,		(vop_t *) msdosfs_poll },
+	{ &vop_print_desc,		(vop_t *) msdosfs_print },
+	{ &vop_read_desc,		(vop_t *) msdosfs_read },
+	{ &vop_readdir_desc,		(vop_t *) msdosfs_readdir },
+	{ &vop_readlink_desc,	(vop_t *) msdosfs_readlink },
+	{ &vop_reallocblks_desc,	(vop_t *) msdosfs_reallocblks },
+	{ &vop_reclaim_desc,		(vop_t *) msdosfs_reclaim },
+	{ &vop_remove_desc,		(vop_t *) msdosfs_remove },
+	{ &vop_rename_desc,		(vop_t *) msdosfs_rename },
+	{ &vop_rmdir_desc,		(vop_t *) msdosfs_rmdir },
+	{ &vop_seek_desc,		(vop_t *) msdosfs_seek },
+	{ &vop_setattr_desc,		(vop_t *) msdosfs_setattr },
+	{ &vop_strategy_desc,	(vop_t *) msdosfs_strategy },
+	{ &vop_symlink_desc,		(vop_t *) msdosfs_symlink },
+	{ &vop_unlock_desc,		(vop_t *) msdosfs_unlock },
+	{ &vop_write_desc,		(vop_t *) msdosfs_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc msdosfs_vnodeop_opv_desc =
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 9db6725..f9f7226 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $
+ *	$Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.21 1997/08/02 14:32:05 bde Exp $
+ * $Id: null_vnops.c,v 1.22 1997/09/18 18:33:18 phk Exp $
  */
 
 /*
@@ -639,21 +639,18 @@ null_bwrite(ap)
  */
 vop_t **null_vnodeop_p;
 static struct vnodeopv_entry_desc null_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)null_bypass },
-
-	{ &vop_lookup_desc, (vop_t *)null_lookup },
-	{ &vop_setattr_desc, (vop_t *)null_setattr },
-	{ &vop_getattr_desc, (vop_t *)null_getattr },
-	{ &vop_access_desc, (vop_t *)null_access },
-	{ &vop_lock_desc, (vop_t *)null_lock },
-	{ &vop_unlock_desc, (vop_t *)null_unlock },
-	{ &vop_inactive_desc, (vop_t *)null_inactive },
-	{ &vop_reclaim_desc, (vop_t *)null_reclaim },
-	{ &vop_print_desc, (vop_t *)null_print },
-
-	{ &vop_strategy_desc, (vop_t *)null_strategy },
-	{ &vop_bwrite_desc, (vop_t *)null_bwrite },
-
+	{ &vop_default_desc,		(vop_t *) null_bypass },
+	{ &vop_access_desc,		(vop_t *) null_access },
+	{ &vop_bwrite_desc,		(vop_t *) null_bwrite },
+	{ &vop_getattr_desc,		(vop_t *) null_getattr },
+	{ &vop_inactive_desc,	(vop_t *) null_inactive },
+	{ &vop_lock_desc,		(vop_t *) null_lock },
+	{ &vop_lookup_desc,		(vop_t *) null_lookup },
+	{ &vop_print_desc,		(vop_t *) null_print },
+	{ &vop_reclaim_desc,		(vop_t *) null_reclaim },
+	{ &vop_setattr_desc,		(vop_t *) null_setattr },
+	{ &vop_strategy_desc,	(vop_t *) null_strategy },
+	{ &vop_unlock_desc,		(vop_t *) null_unlock },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc null_vnodeop_opv_desc =
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index a8b05cd..75a2101 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.20 1997/08/16 19:15:18 wollman Exp $
+ * $Id: portal_vnops.c,v 1.21 1997/09/14 02:57:57 peter Exp $
  */
 
 /*
@@ -693,54 +693,48 @@ portal_badop()
 
 vop_t **portal_vnodeop_p;
 static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)portal_mknod },		/* mknod */
-	{ &vop_open_desc, (vop_t *)portal_open },		/* open */
-	{ &vop_close_desc, (vop_t *)portal_close },		/* close */
-	{ &vop_access_desc, (vop_t *)portal_access },		/* access */
-	{ &vop_getattr_desc, (vop_t *)portal_getattr },		/* getattr */
-	{ &vop_setattr_desc, (vop_t *)portal_setattr },		/* setattr */
-	{ &vop_read_desc, (vop_t *)portal_read },		/* read */
-	{ &vop_write_desc, (vop_t *)portal_write },		/* write */
-/* XXX: vop_lease */
-	{ &vop_ioctl_desc, (vop_t *)portal_ioctl },		/* ioctl */
-	{ &vop_poll_desc, (vop_t *)portal_poll },		/* poll */
-	{ &vop_mmap_desc, (vop_t *)portal_mmap },		/* mmap */
-	{ &vop_revoke_desc, (vop_t *)portal_revoke },		/* revoke */
-	{ &vop_fsync_desc, (vop_t *)portal_fsync },		/* fsync */
-	{ &vop_seek_desc, (vop_t *)portal_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)portal_remove },		/* remove */
-	{ &vop_link_desc, (vop_t *)portal_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)portal_rename },		/* rename */
-	{ &vop_mkdir_desc, (vop_t *)portal_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)portal_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)portal_symlink },		/* symlink */
-	{ &vop_readdir_desc, (vop_t *)portal_readdir },		/* readdir */
-	{ &vop_readlink_desc, (vop_t *)portal_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)portal_abortop },		/* abortop */
-	{ &vop_inactive_desc, (vop_t *)portal_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)portal_reclaim },		/* reclaim */
-	{ &vop_lock_desc, (vop_t *)portal_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)portal_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *)portal_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)portal_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)portal_print },		/* print */
-	{ &vop_islocked_desc, (vop_t *)portal_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)portal_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)portal_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)portal_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)portal_valloc },		/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)portal_vfree },		/* vfree */
-	{ &vop_truncate_desc, (vop_t *)portal_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)portal_update },		/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
+	{ &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_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_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_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 },
 	{ 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 7912c95..0d989c4 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.32 1997/09/14 02:57:58 peter Exp $
+ *	$Id: procfs_vnops.c,v 1.33 1997/09/21 04:23:23 dyson Exp $
  */
 
 /*
@@ -968,54 +968,47 @@ atopid(b, len)
  */
 vop_t **procfs_vnodeop_p;
 static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)procfs_lookup },		/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)procfs_create },		/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)procfs_mknod },		/* mknod */
-	{ &vop_open_desc, (vop_t *)procfs_open },		/* open */
-	{ &vop_close_desc, (vop_t *)procfs_close },		/* close */
-	{ &vop_access_desc, (vop_t *)procfs_access },		/* access */
-	{ &vop_getattr_desc, (vop_t *)procfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, (vop_t *)procfs_setattr },		/* setattr */
-	{ &vop_read_desc, (vop_t *)procfs_read },		/* read */
-	{ &vop_write_desc, (vop_t *)procfs_write },		/* write */
-/* XXX: vop_lease */
-	{ &vop_ioctl_desc, (vop_t *)procfs_ioctl },		/* ioctl */
-	{ &vop_poll_desc, (vop_t *)procfs_poll },		/* poll */
-	{ &vop_mmap_desc, (vop_t *)procfs_mmap },		/* mmap */
-	{ &vop_revoke_desc, (vop_t *)procfs_revoke },		/* revoke */
-	{ &vop_fsync_desc, (vop_t *)procfs_fsync },		/* fsync */
-	{ &vop_seek_desc, (vop_t *)procfs_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)procfs_remove },		/* remove */
-	{ &vop_link_desc, (vop_t *)procfs_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)procfs_rename },		/* rename */
-	{ &vop_mkdir_desc, (vop_t *)procfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)procfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)procfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, (vop_t *)procfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, (vop_t *)procfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)procfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, (vop_t *)procfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)procfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, (vop_t *)procfs_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)procfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *)procfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)procfs_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)procfs_print },		/* print */
-	{ &vop_islocked_desc, (vop_t *)procfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)procfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)procfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)procfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)procfs_valloc },		/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)procfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, (vop_t *)procfs_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)procfs_update },		/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-/* XXX: vop_bwrite */
+	{ &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_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_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_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_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_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_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 },
 	{ 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 dd05fc0..d798e81 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.42 1997/09/14 02:58:02 peter Exp $
+ * $Id: spec_vnops.c,v 1.43 1997/09/27 13:39:20 kato Exp $
  */
 
 #include <sys/param.h>
@@ -64,54 +64,50 @@ static int	spec_getattr __P((struct  vop_getattr_args *));
 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_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
-/* XXX: vop_whiteout */
-	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
-	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
-	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
-	{ &vop_access_desc, (vop_t *)spec_access },	/* access */
-	{ &vop_getattr_desc, (vop_t *)spec_getattr },	/* getattr */
-	{ &vop_setattr_desc, (vop_t *)spec_setattr },	/* setattr */
-	{ &vop_read_desc, (vop_t *)spec_read },		/* read */
-	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
-	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
-	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
-	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
-	{ &vop_seek_desc, (vop_t *)spec_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)spec_remove },	/* remove */
-	{ &vop_link_desc, (vop_t *)spec_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)spec_rename },	/* rename */
-	{ &vop_mkdir_desc, (vop_t *)spec_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)spec_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)spec_symlink },	/* symlink */
-	{ &vop_readdir_desc, (vop_t *)spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, (vop_t *)spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, (vop_t *)spec_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)spec_reclaim },	/* reclaim */
-	{ &vop_lock_desc, (vop_t *)spec_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)spec_unlock },	/* unlock */
-	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)spec_print },	/* print */
-	{ &vop_islocked_desc, (vop_t *)spec_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)spec_update },	/* update */
-	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) spec_abortop },
+	{ &vop_access_desc,		(vop_t *) spec_access },
+	{ &vop_advlock_desc,		(vop_t *) spec_advlock },
+	{ &vop_blkatoff_desc,	(vop_t *) spec_blkatoff },
+	{ &vop_bmap_desc,		(vop_t *) spec_bmap },
+	{ &vop_bwrite_desc,		(vop_t *) vn_bwrite },
+	{ &vop_close_desc,		(vop_t *) spec_close },
+	{ &vop_create_desc,		(vop_t *) spec_create },
+	{ &vop_fsync_desc,		(vop_t *) spec_fsync },
+	{ &vop_getattr_desc,		(vop_t *) spec_getattr },
+	{ &vop_getpages_desc,	(vop_t *) spec_getpages },
+	{ &vop_inactive_desc,	(vop_t *) spec_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) spec_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) spec_islocked },
+	{ &vop_lease_desc,		(vop_t *) spec_lease_check },
+	{ &vop_link_desc,		(vop_t *) spec_link },
+	{ &vop_lock_desc,		(vop_t *) spec_lock },
+	{ &vop_lookup_desc,		(vop_t *) spec_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) spec_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) spec_mknod },
+	{ &vop_mmap_desc,		(vop_t *) spec_mmap },
+	{ &vop_open_desc,		(vop_t *) spec_open },
+	{ &vop_pathconf_desc,	(vop_t *) spec_pathconf },
+	{ &vop_poll_desc,		(vop_t *) spec_poll },
+	{ &vop_print_desc,		(vop_t *) spec_print },
+	{ &vop_read_desc,		(vop_t *) spec_read },
+	{ &vop_readdir_desc,		(vop_t *) spec_readdir },
+	{ &vop_readlink_desc,	(vop_t *) spec_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) spec_reclaim },
+	{ &vop_remove_desc,		(vop_t *) spec_remove },
+	{ &vop_rename_desc,		(vop_t *) spec_rename },
+	{ &vop_revoke_desc,		(vop_t *) spec_revoke },
+	{ &vop_rmdir_desc,		(vop_t *) spec_rmdir },
+	{ &vop_seek_desc,		(vop_t *) spec_seek },
+	{ &vop_setattr_desc,		(vop_t *) spec_setattr },
+	{ &vop_strategy_desc,	(vop_t *) spec_strategy },
+	{ &vop_symlink_desc,		(vop_t *) spec_symlink },
+	{ &vop_truncate_desc,	(vop_t *) spec_truncate },
+	{ &vop_unlock_desc,		(vop_t *) spec_unlock },
+	{ &vop_update_desc,		(vop_t *) spec_update },
+	{ &vop_valloc_desc,		(vop_t *) spec_valloc },
+	{ &vop_vfree_desc,		(vop_t *) spec_vfree },
+	{ &vop_write_desc,		(vop_t *) spec_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc spec_vnodeop_opv_desc =
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 64d5fba..dc6d9d9 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.18 1997/08/02 14:32:26 bde Exp $
+ * $Id: umap_vnops.c,v 1.19 1997/09/18 18:33:23 phk Exp $
  */
 
 /*
@@ -529,19 +529,16 @@ umap_rename(ap)
  */
 vop_t **umap_vnodeop_p;
 static struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)umap_bypass },
-
-	{ &vop_getattr_desc, (vop_t *)umap_getattr },
-	{ &vop_lock_desc, (vop_t *)umap_lock },
-	{ &vop_unlock_desc, (vop_t *)umap_unlock },
-	{ &vop_inactive_desc, (vop_t *)umap_inactive },
-	{ &vop_reclaim_desc, (vop_t *)umap_reclaim },
-	{ &vop_print_desc, (vop_t *)umap_print },
-	{ &vop_rename_desc, (vop_t *)umap_rename },
-
-	{ &vop_strategy_desc, (vop_t *)umap_strategy },
-	{ &vop_bwrite_desc, (vop_t *)umap_bwrite },
-
+	{ &vop_default_desc,		(vop_t *) umap_bypass },
+	{ &vop_bwrite_desc,		(vop_t *) umap_bwrite },
+	{ &vop_getattr_desc,		(vop_t *) umap_getattr },
+	{ &vop_inactive_desc,	(vop_t *) umap_inactive },
+	{ &vop_lock_desc,		(vop_t *) umap_lock },
+	{ &vop_print_desc,		(vop_t *) umap_print },
+	{ &vop_reclaim_desc,		(vop_t *) umap_reclaim },
+	{ &vop_rename_desc,		(vop_t *) umap_rename },
+	{ &vop_strategy_desc,	(vop_t *) umap_strategy },
+	{ &vop_unlock_desc,		(vop_t *) umap_unlock },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc umap_vnodeop_opv_desc =
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 469ae53..f4573bf 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.41 1997/09/07 06:46:34 bde Exp $
+ * $Id: union_vnops.c,v 1.42 1997/09/14 02:58:04 peter Exp $
  */
 
 #include <sys/param.h>
@@ -1755,56 +1755,44 @@ union_strategy(ap)
  */
 vop_t **union_vnodeop_p;
 static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
-	{ &vop_default_desc, (vop_t *)vn_default_error },
-	{ &vop_lookup_desc, (vop_t *)union_lookup },		/* lookup */
-/* XXX: vop_cachedlookup */
-	{ &vop_create_desc, (vop_t *)union_create },		/* create */
-	{ &vop_whiteout_desc, (vop_t *)union_whiteout },	/* whiteout */
-	{ &vop_mknod_desc, (vop_t *)union_mknod },		/* mknod */
-	{ &vop_open_desc, (vop_t *)union_open },		/* open */
-	{ &vop_close_desc, (vop_t *)union_close },		/* close */
-	{ &vop_access_desc, (vop_t *)union_access },		/* access */
-	{ &vop_getattr_desc, (vop_t *)union_getattr },		/* getattr */
-	{ &vop_setattr_desc, (vop_t *)union_setattr },		/* setattr */
-	{ &vop_read_desc, (vop_t *)union_read },		/* read */
-	{ &vop_write_desc, (vop_t *)union_write },		/* write */
-	{ &vop_lease_desc, (vop_t *)union_lease },		/* lease */
-	{ &vop_ioctl_desc, (vop_t *)union_ioctl },		/* ioctl */
-	{ &vop_poll_desc, (vop_t *)union_poll },		/* poll */
-	{ &vop_revoke_desc, (vop_t *)union_revoke },		/* revoke */
-	{ &vop_mmap_desc, (vop_t *)union_mmap },		/* mmap */
-	{ &vop_fsync_desc, (vop_t *)union_fsync },		/* fsync */
-	{ &vop_seek_desc, (vop_t *)union_seek },		/* seek */
-	{ &vop_remove_desc, (vop_t *)union_remove },		/* remove */
-	{ &vop_link_desc, (vop_t *)union_link },		/* link */
-	{ &vop_rename_desc, (vop_t *)union_rename },		/* rename */
-	{ &vop_mkdir_desc, (vop_t *)union_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, (vop_t *)union_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, (vop_t *)union_symlink },		/* symlink */
-	{ &vop_readdir_desc, (vop_t *)union_readdir },		/* readdir */
-	{ &vop_readlink_desc, (vop_t *)union_readlink },	/* readlink */
-	{ &vop_abortop_desc, (vop_t *)union_abortop },		/* abortop */
-	{ &vop_inactive_desc, (vop_t *)union_inactive },	/* inactive */
-	{ &vop_reclaim_desc, (vop_t *)union_reclaim },		/* reclaim */
-	{ &vop_lock_desc, (vop_t *)union_lock },		/* lock */
-	{ &vop_unlock_desc, (vop_t *)union_unlock },		/* unlock */
-	{ &vop_bmap_desc, (vop_t *)union_bmap },		/* bmap */
-	{ &vop_strategy_desc, (vop_t *)union_strategy },	/* strategy */
-	{ &vop_print_desc, (vop_t *)union_print },		/* print */
-	{ &vop_islocked_desc, (vop_t *)union_islocked },	/* islocked */
-	{ &vop_pathconf_desc, (vop_t *)union_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, (vop_t *)union_advlock },		/* advlock */
-#ifdef notdef
-	{ &vop_blkatoff_desc, (vop_t *)union_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, (vop_t *)union_valloc },		/* valloc */
-/* XXX: vop_reallocblks */
-	{ &vop_vfree_desc, (vop_t *)union_vfree },		/* vfree */
-	{ &vop_truncate_desc, (vop_t *)union_truncate },	/* truncate */
-	{ &vop_update_desc, (vop_t *)union_update },		/* update */
-/* XXX: vop_getpages */
-/* XXX: vop_putpages */
-	{ &vop_bwrite_desc, (vop_t *)union_bwrite },		/* bwrite */
-#endif
+	{ &vop_default_desc,		(vop_t *) vn_default_error },
+	{ &vop_abortop_desc,		(vop_t *) union_abortop },
+	{ &vop_access_desc,		(vop_t *) union_access },
+	{ &vop_advlock_desc,		(vop_t *) union_advlock },
+	{ &vop_bmap_desc,		(vop_t *) union_bmap },
+	{ &vop_close_desc,		(vop_t *) union_close },
+	{ &vop_create_desc,		(vop_t *) union_create },
+	{ &vop_fsync_desc,		(vop_t *) union_fsync },
+	{ &vop_getattr_desc,		(vop_t *) union_getattr },
+	{ &vop_inactive_desc,	(vop_t *) union_inactive },
+	{ &vop_ioctl_desc,		(vop_t *) union_ioctl },
+	{ &vop_islocked_desc,	(vop_t *) union_islocked },
+	{ &vop_lease_desc,		(vop_t *) union_lease },
+	{ &vop_link_desc,		(vop_t *) union_link },
+	{ &vop_lock_desc,		(vop_t *) union_lock },
+	{ &vop_lookup_desc,		(vop_t *) union_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) union_mkdir },
+	{ &vop_mknod_desc,		(vop_t *) union_mknod },
+	{ &vop_mmap_desc,		(vop_t *) union_mmap },
+	{ &vop_open_desc,		(vop_t *) union_open },
+	{ &vop_pathconf_desc,	(vop_t *) union_pathconf },
+	{ &vop_poll_desc,		(vop_t *) union_poll },
+	{ &vop_print_desc,		(vop_t *) union_print },
+	{ &vop_read_desc,		(vop_t *) union_read },
+	{ &vop_readdir_desc,		(vop_t *) union_readdir },
+	{ &vop_readlink_desc,	(vop_t *) union_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) union_reclaim },
+	{ &vop_remove_desc,		(vop_t *) union_remove },
+	{ &vop_rename_desc,		(vop_t *) union_rename },
+	{ &vop_revoke_desc,		(vop_t *) union_revoke },
+	{ &vop_rmdir_desc,		(vop_t *) union_rmdir },
+	{ &vop_seek_desc,		(vop_t *) union_seek },
+	{ &vop_setattr_desc,		(vop_t *) union_setattr },
+	{ &vop_strategy_desc,	(vop_t *) union_strategy },
+	{ &vop_symlink_desc,		(vop_t *) union_symlink },
+	{ &vop_unlock_desc,		(vop_t *) union_unlock },
+	{ &vop_whiteout_desc,	(vop_t *) union_whiteout },
+	{ &vop_write_desc,		(vop_t *) union_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc union_vnodeop_opv_desc =