Introduced a type `vop_t' for vnode operation functions and used

it 1138 times (:-() in casts and a few more times in declarations.
This change is null for the i386.

The type has to be `typedef int vop_t(void *)' and not `typedef
int vop_t()' because `gcc -Wstrict-prototypes' warns about the
latter.  Since vnode op functions are called with args of different
(struct pointer) types, neither of these function types is any use
for type checking of the arg, so it would be preferable not to use
the complete function type, especially since using the complete
type requires adding 1138 casts to avoid compiler warnings and
another 40+ casts to reverse the function pointer conversions before
calling the functions.

66 files changed, 2082 insertions, 2076 deletions

diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 479ad34..4f0c98d 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.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.h,v 1.5 1995/03/16 18:12:16 bde Exp $
+ * $Id: cd9660_node.h,v 1.6 1995/10/31 12:13:44 phk Exp $
  */
 
 /*
@@ -111,8 +111,8 @@ struct iso_node {
 #define ISO_ILOCK(ip)	iso_ilock(ip)
 #define ISO_IUNLOCK(ip)	iso_iunlock(ip)
 
-extern int	(**cd9660_fifoop_p)();
-extern int	(**cd9660_specop_p)();
+extern vop_t	**cd9660_fifoop_p;
+extern vop_t	**cd9660_specop_p;
 
 /*
  * Prototypes for ISOFS vnode operations
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index e2e8df2..074de85 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.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.17 1995/10/23 02:22:34 dyson Exp $
+ * $Id: cd9660_vnops.c,v 1.18 1995/10/31 12:13:47 phk Exp $
  */
 
 #include <sys/param.h>
@@ -929,50 +929,50 @@ cd9660_enotsupp()
 /*
  * Global vfs data structures for nfs
  */
-int (**cd9660_vnodeop_p)();
+vop_t **cd9660_vnodeop_p;
 static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, cd9660_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, cd9660_open },	/* open */
-	{ &vop_close_desc, cd9660_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, cd9660_read },	/* read */
-	{ &vop_write_desc, cd9660_write },	/* write */
-	{ &vop_ioctl_desc, cd9660_ioctl },	/* ioctl */
-	{ &vop_select_desc, cd9660_select },	/* select */
-	{ &vop_mmap_desc, cd9660_mmap },	/* mmap */
-	{ &vop_fsync_desc, cd9660_fsync },	/* fsync */
-	{ &vop_seek_desc, cd9660_seek },	/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, cd9660_readdir },	/* readdir */
-	{ &vop_readlink_desc, cd9660_readlink },/* readlink */
-	{ &vop_abortop_desc, cd9660_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, cd9660_bmap },	/* bmap */
-	{ &vop_strategy_desc, cd9660_strategy },/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
-	{ &vop_advlock_desc, cd9660_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, cd9660_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, cd9660_valloc },	/* valloc */
-	{ &vop_vfree_desc, cd9660_vfree },	/* vfree */
-	{ &vop_truncate_desc, cd9660_truncate },/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)cd9660_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &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_ioctl_desc, (vop_t *)cd9660_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)cd9660_select },		/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 	{ &cd9660_vnodeop_p, cd9660_vnodeop_entries };
@@ -981,100 +981,100 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc);
 /*
  * Special device vnode ops
  */
-int (**cd9660_specop_p)();
+vop_t **cd9660_specop_p;
 static struct vnodeopv_entry_desc cd9660_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, spec_open },		/* open */
-	{ &vop_close_desc, spec_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, spec_read },		/* read */
-	{ &vop_write_desc, spec_write },	/* write */
-	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, spec_select },	/* select */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, spec_fsync },	/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, spec_strategy },  /* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
- 	{ &vop_getpages_desc, spec_getpages},
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_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_ioctl_desc, (vop_t *)spec_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },		/* select */
+	{ &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 *)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 *)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 */
+	{ &vop_vfree_desc, (vop_t *)spec_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+ 	{ &vop_getpages_desc, (vop_t *)spec_getpages},		/* getpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 VNODEOP_SET(cd9660_specop_opv_desc);
 
-int (**cd9660_fifoop_p)();
+vop_t **cd9660_fifoop_p;
 static struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, fifo_open },		/* open */
-	{ &vop_close_desc, fifo_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, fifo_read },		/* read */
-	{ &vop_write_desc, fifo_write },	/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, fifo_select },	/* select */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, fifo_badop },	/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_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_ioctl_desc, (vop_t *)fifo_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },		/* select */
+	{ &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 *)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 *)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_badop },		/* 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 */
+	{ &vop_vfree_desc, (vop_t *)fifo_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index bf5c44c..fa9e2c0 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.6 1995/07/25 21:50:50 bde Exp $
+ * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -223,7 +223,7 @@ int iso_ilock __P((struct iso_node *ip));
 int iso_iunlock __P((struct iso_node *ip));
 int cd9660_mountroot __P((void));
 
-extern int (**cd9660_vnodeop_p)();
+extern vop_t **cd9660_vnodeop_p;
 
 static inline int
 isonum_711(p)
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 56a33bc..55534d1 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.6 1994/10/08 22:37:00 phk Exp $
+ * $Id: dead_vnops.c,v 1.7 1995/09/04 00:20:26 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -91,50 +91,50 @@ int	dead_print __P((struct vop_print_args *));
 #define dead_update ((int (*) __P((struct  vop_update_args *)))nullop)
 #define dead_bwrite ((int (*) __P((struct  vop_bwrite_args *)))nullop)
 
-int (**dead_vnodeop_p)();
+vop_t **dead_vnodeop_p;
 struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, dead_lookup },	/* lookup */
-	{ &vop_create_desc, dead_create },	/* create */
-	{ &vop_mknod_desc, dead_mknod },	/* mknod */
-	{ &vop_open_desc, dead_open },	/* open */
-	{ &vop_close_desc, dead_close },	/* close */
-	{ &vop_access_desc, dead_access },	/* access */
-	{ &vop_getattr_desc, dead_getattr },	/* getattr */
-	{ &vop_setattr_desc, dead_setattr },	/* setattr */
-	{ &vop_read_desc, dead_read },	/* read */
-	{ &vop_write_desc, dead_write },	/* write */
-	{ &vop_ioctl_desc, dead_ioctl },	/* ioctl */
-	{ &vop_select_desc, dead_select },	/* select */
-	{ &vop_mmap_desc, dead_mmap },	/* mmap */
-	{ &vop_fsync_desc, dead_fsync },	/* fsync */
-	{ &vop_seek_desc, dead_seek },	/* seek */
-	{ &vop_remove_desc, dead_remove },	/* remove */
-	{ &vop_link_desc, dead_link },	/* link */
-	{ &vop_rename_desc, dead_rename },	/* rename */
-	{ &vop_mkdir_desc, dead_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, dead_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, dead_symlink },	/* symlink */
-	{ &vop_readdir_desc, dead_readdir },	/* readdir */
-	{ &vop_readlink_desc, dead_readlink },	/* readlink */
-	{ &vop_abortop_desc, dead_abortop },	/* abortop */
-	{ &vop_inactive_desc, dead_inactive },	/* inactive */
-	{ &vop_reclaim_desc, dead_reclaim },	/* reclaim */
-	{ &vop_lock_desc, dead_lock },	/* lock */
-	{ &vop_unlock_desc, dead_unlock },	/* unlock */
-	{ &vop_bmap_desc, dead_bmap },	/* bmap */
-	{ &vop_strategy_desc, dead_strategy },	/* strategy */
-	{ &vop_print_desc, dead_print },	/* print */
-	{ &vop_islocked_desc, dead_islocked },	/* islocked */
-	{ &vop_pathconf_desc, dead_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, dead_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, dead_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, dead_valloc },	/* valloc */
-	{ &vop_vfree_desc, dead_vfree },	/* vfree */
-	{ &vop_truncate_desc, dead_truncate },	/* truncate */
-	{ &vop_update_desc, dead_update },	/* update */
-	{ &vop_bwrite_desc, dead_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)dead_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)dead_create },	/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)dead_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)dead_select },	/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)dead_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)dead_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)dead_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)dead_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc dead_vnodeop_opv_desc =
 	{ &dead_vnodeop_p, dead_vnodeop_entries };
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index 4c682e7..3214004 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $
+ * $Id: fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $
  */
 
 #ifdef KERNEL
@@ -77,6 +77,6 @@ extern dev_t devctty;
 extern int fdesc_init __P((void));
 extern int fdesc_root __P((struct mount *, struct vnode **));
 extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-extern int (**fdesc_vnodeop_p)();
+extern vop_t **fdesc_vnodeop_p;
 extern struct vfsops fdesc_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 3c334bb..5f2010b 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.10 1995/09/02 20:19:12 mpp Exp $
+ * $Id: fdesc_vnops.c,v 1.11 1995/11/07 13:39:20 phk Exp $
  */
 
 /*
@@ -936,50 +936,50 @@ fdesc_nullop()
 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))fdesc_enotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))fdesc_enotsupp)
 
-static int (**fdesc_vnodeop_p)();
+static vop_t **fdesc_vnodeop_p;
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fdesc_lookup },	/* lookup */
-	{ &vop_create_desc, fdesc_create },	/* create */
-	{ &vop_mknod_desc, fdesc_mknod },	/* mknod */
-	{ &vop_open_desc, fdesc_open },		/* open */
-	{ &vop_close_desc, fdesc_close },	/* close */
-	{ &vop_access_desc, fdesc_access },	/* access */
-	{ &vop_getattr_desc, fdesc_getattr },	/* getattr */
-	{ &vop_setattr_desc, fdesc_setattr },	/* setattr */
-	{ &vop_read_desc, fdesc_read },		/* read */
-	{ &vop_write_desc, fdesc_write },	/* write */
-	{ &vop_ioctl_desc, fdesc_ioctl },	/* ioctl */
-	{ &vop_select_desc, fdesc_select },	/* select */
-	{ &vop_mmap_desc, fdesc_mmap },		/* mmap */
-	{ &vop_fsync_desc, fdesc_fsync },	/* fsync */
-	{ &vop_seek_desc, fdesc_seek },		/* seek */
-	{ &vop_remove_desc, fdesc_remove },	/* remove */
-	{ &vop_link_desc, fdesc_link },		/* link */
-	{ &vop_rename_desc, fdesc_rename },	/* rename */
-	{ &vop_mkdir_desc, fdesc_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, fdesc_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, fdesc_symlink },	/* symlink */
-	{ &vop_readdir_desc, fdesc_readdir },	/* readdir */
-	{ &vop_readlink_desc, fdesc_readlink },	/* readlink */
-	{ &vop_abortop_desc, fdesc_abortop },	/* abortop */
-	{ &vop_inactive_desc, fdesc_inactive },	/* inactive */
-	{ &vop_reclaim_desc, fdesc_reclaim },	/* reclaim */
-	{ &vop_lock_desc, fdesc_lock },		/* lock */
-	{ &vop_unlock_desc, fdesc_unlock },	/* unlock */
-	{ &vop_bmap_desc, fdesc_bmap },		/* bmap */
-	{ &vop_strategy_desc, fdesc_strategy },	/* strategy */
-	{ &vop_print_desc, fdesc_print },	/* print */
-	{ &vop_islocked_desc, fdesc_islocked },	/* islocked */
-	{ &vop_pathconf_desc, fdesc_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fdesc_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fdesc_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fdesc_valloc },	/* valloc */
-	{ &vop_vfree_desc, fdesc_vfree },	/* vfree */
-	{ &vop_truncate_desc, fdesc_truncate },	/* truncate */
-	{ &vop_update_desc, fdesc_update },	/* update */
-	{ &vop_bwrite_desc, fdesc_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)fdesc_create },		/* create */
+	{ &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 */
+	{ &vop_write_desc, (vop_t *)fdesc_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)fdesc_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)fdesc_select },		/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)fdesc_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fdesc_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)fdesc_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)fdesc_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc fdesc_vnodeop_opv_desc =
 	{ &fdesc_vnodeop_p, fdesc_vnodeop_entries };
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index 3f2d8ef..5556626 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,10 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $
+ * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $
  */
 
-extern int	(**fifo_vnodeop_p)();
+extern vop_t **fifo_vnodeop_p;
 
 /*
  * Prototypes for fifo operations on vnodes.
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 8291ebb..dee76fb 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.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.10 1995/08/06 16:14:21 jkh Exp $
+ * $Id: fifo_vnops.c,v 1.11 1995/09/04 00:20:33 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -62,50 +62,50 @@ struct fifoinfo {
 	long		fi_writers;
 };
 
-int (**fifo_vnodeop_p)();
+vop_t **fifo_vnodeop_p;
 struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, fifo_close },		/* close */
-	{ &vop_access_desc, fifo_access },		/* access */
-	{ &vop_getattr_desc, fifo_getattr },		/* getattr */
-	{ &vop_setattr_desc, fifo_setattr },		/* setattr */
-	{ &vop_read_desc, fifo_read },			/* read */
-	{ &vop_write_desc, fifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, fifo_inactive },		/* inactive */
-	{ &vop_reclaim_desc, fifo_reclaim },		/* reclaim */
-	{ &vop_lock_desc, fifo_lock },			/* lock */
-	{ &vop_unlock_desc, fifo_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, fifo_print },		/* print */
-	{ &vop_islocked_desc, fifo_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, fifo_update },		/* update */
-	{ &vop_bwrite_desc, fifo_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &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 */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc fifo_vnodeop_opv_desc =
 	{ &fifo_vnodeop_p, fifo_vnodeop_entries };
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index b9ea01c..7b7dc3a 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.6 1995/08/02 12:59:47 dfr Exp $ */
+/*	$Id: denode.h,v 1.7 1995/10/29 15:31:43 phk Exp $ */
 /*	$NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $	*/
 
 /*-
@@ -226,10 +226,12 @@ struct defid {
 	/* u_long	defid_gen;	 generation number */
 };
 
-extern int (**msdosfs_vnodeop_p)();
+extern vop_t **msdosfs_vnodeop_p;
+
 int msdosfs_lookup __P((struct vop_lookup_args *));
 int msdosfs_inactive __P((struct vop_inactive_args *));
 int msdosfs_reclaim __P((struct vop_reclaim_args *));
+
 /*
  * Internal service routine prototypes.
  */
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index b501a5d..de44543 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.25 1995/10/22 09:32:37 davidg Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.26 1995/10/29 15:31:53 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -2000,46 +2000,46 @@ msdosfs_pathconf(ap)
 }
 
 /* Global vfs data structures for msdosfs */
-int (**msdosfs_vnodeop_p)();
+vop_t **msdosfs_vnodeop_p;
 static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, msdosfs_lookup },		/* lookup */
-	{ &vop_create_desc, msdosfs_create },		/* create */
-	{ &vop_mknod_desc, msdosfs_mknod },		/* mknod */
-	{ &vop_open_desc, msdosfs_open },		/* open */
-	{ &vop_close_desc, msdosfs_close },		/* close */
-	{ &vop_access_desc, msdosfs_access },		/* access */
-	{ &vop_getattr_desc, msdosfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, msdosfs_setattr },		/* setattr */
-	{ &vop_read_desc, msdosfs_read },		/* read */
-	{ &vop_write_desc, msdosfs_write },		/* write */
-	{ &vop_ioctl_desc, msdosfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, msdosfs_select },		/* select */
-	{ &vop_mmap_desc, msdosfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, msdosfs_fsync },		/* fsync */
-	{ &vop_seek_desc, msdosfs_seek },		/* seek */
-	{ &vop_remove_desc, msdosfs_remove },		/* remove */
-	{ &vop_link_desc, msdosfs_link },		/* link */
-	{ &vop_rename_desc, msdosfs_rename },		/* rename */
-	{ &vop_mkdir_desc, msdosfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, msdosfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, msdosfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, msdosfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, msdosfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, msdosfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, msdosfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, msdosfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, msdosfs_lock },		/* lock */
-	{ &vop_unlock_desc, msdosfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, msdosfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, msdosfs_strategy },	/* strategy */
-	{ &vop_print_desc, msdosfs_print },		/* print */
-	{ &vop_islocked_desc, msdosfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, msdosfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, msdosfs_advlock },		/* advlock */
-	{ &vop_reallocblks_desc, msdosfs_reallocblks },	/* reallocblks */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc *)NULL, (int (*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)msdosfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)msdosfs_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)msdosfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)msdosfs_select },		/* select */
+	{ &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 */
+	{ &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks },	/* reallocblks */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc msdosfs_vnodeop_opv_desc =
 	{ &msdosfs_vnodeop_p, msdosfs_vnodeop_entries };
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 14286ff..f957249 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.2 (Berkeley) 1/21/94
  *
- * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $
+ * $Id: null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp $
  */
 
 struct null_args {
@@ -70,6 +70,6 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
 #endif
 
-extern int (**null_vnodeop_p)();
+extern vop_t **null_vnodeop_p;
 extern struct vfsops null_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 464d15a..41e9f70 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $
+ * $Id: null_vnops.c,v 1.8 1995/05/30 08:07:03 rgrimes Exp $
  */
 
 /*
@@ -441,19 +441,19 @@ null_bwrite(ap)
 /*
  * Global vfs data structures
  */
-int (**null_vnodeop_p)();
+vop_t **null_vnodeop_p;
 struct vnodeopv_entry_desc null_vnodeop_entries[] = {
-	{ &vop_default_desc, null_bypass },
+	{ &vop_default_desc, (vop_t *)null_bypass },
 
-	{ &vop_getattr_desc, null_getattr },
-	{ &vop_inactive_desc, null_inactive },
-	{ &vop_reclaim_desc, null_reclaim },
-	{ &vop_print_desc, null_print },
+	{ &vop_getattr_desc, (vop_t *)null_getattr },
+	{ &vop_inactive_desc, (vop_t *)null_inactive },
+	{ &vop_reclaim_desc, (vop_t *)null_reclaim },
+	{ &vop_print_desc, (vop_t *)null_print },
 
-	{ &vop_strategy_desc, null_strategy },
-	{ &vop_bwrite_desc, null_bwrite },
+	{ &vop_strategy_desc, (vop_t *)null_strategy },
+	{ &vop_bwrite_desc, (vop_t *)null_bwrite },
 
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc null_vnodeop_opv_desc =
 	{ &null_vnodeop_p, null_vnodeop_entries };
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index 38d7ee0..f2f1e7b 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $
+ * $Id: portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $
  */
 
 struct portal_args {
@@ -67,6 +67,6 @@ struct portalnode {
 
 #define PORTAL_ROOTFILEID	2
 
-extern int (**portal_vnodeop_p)();
+extern vop_t **portal_vnodeop_p;
 extern struct vfsops portal_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 4ee5824..7bea6da 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.6 1995/05/30 08:07:06 rgrimes Exp $
+ * $Id: portal_vnops.c,v 1.7 1995/10/08 00:09:00 swallace Exp $
  */
 
 /*
@@ -659,50 +659,50 @@ portal_nullop()
 #define portal_update ((int (*) __P((struct vop_update_args *)))portal_enotsupp)
 #define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp)
 
-int (**portal_vnodeop_p)();
+vop_t **portal_vnodeop_p;
 struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, portal_lookup },		/* lookup */
-	{ &vop_create_desc, portal_create },		/* create */
-	{ &vop_mknod_desc, portal_mknod },		/* mknod */
-	{ &vop_open_desc, portal_open },		/* open */
-	{ &vop_close_desc, portal_close },		/* close */
-	{ &vop_access_desc, portal_access },		/* access */
-	{ &vop_getattr_desc, portal_getattr },		/* getattr */
-	{ &vop_setattr_desc, portal_setattr },		/* setattr */
-	{ &vop_read_desc, portal_read },		/* read */
-	{ &vop_write_desc, portal_write },		/* write */
-	{ &vop_ioctl_desc, portal_ioctl },		/* ioctl */
-	{ &vop_select_desc, portal_select },		/* select */
-	{ &vop_mmap_desc, portal_mmap },		/* mmap */
-	{ &vop_fsync_desc, portal_fsync },		/* fsync */
-	{ &vop_seek_desc, portal_seek },		/* seek */
-	{ &vop_remove_desc, portal_remove },		/* remove */
-	{ &vop_link_desc, portal_link },		/* link */
-	{ &vop_rename_desc, portal_rename },		/* rename */
-	{ &vop_mkdir_desc, portal_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, portal_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, portal_symlink },		/* symlink */
-	{ &vop_readdir_desc, portal_readdir },		/* readdir */
-	{ &vop_readlink_desc, portal_readlink },	/* readlink */
-	{ &vop_abortop_desc, portal_abortop },		/* abortop */
-	{ &vop_inactive_desc, portal_inactive },	/* inactive */
-	{ &vop_reclaim_desc, portal_reclaim },		/* reclaim */
-	{ &vop_lock_desc, portal_lock },		/* lock */
-	{ &vop_unlock_desc, portal_unlock },		/* unlock */
-	{ &vop_bmap_desc, portal_bmap },		/* bmap */
-	{ &vop_strategy_desc, portal_strategy },	/* strategy */
-	{ &vop_print_desc, portal_print },		/* print */
-	{ &vop_islocked_desc, portal_islocked },	/* islocked */
-	{ &vop_pathconf_desc, portal_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, portal_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, portal_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, portal_valloc },		/* valloc */
-	{ &vop_vfree_desc, portal_vfree },		/* vfree */
-	{ &vop_truncate_desc, portal_truncate },	/* truncate */
-	{ &vop_update_desc, portal_update },		/* update */
-	{ &vop_bwrite_desc, portal_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)portal_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)portal_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)portal_mmap },		/* mmap */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)portal_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)portal_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)portal_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc portal_vnodeop_opv_desc =
 	{ &portal_vnodeop_p, portal_vnodeop_entries };
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 4632f2b..f21813f 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- *	$Id: procfs.h,v 1.5 1995/05/25 01:35:22 davidg Exp $
+ *	$Id: procfs.h,v 1.6 1995/11/07 13:39:29 phk Exp $
  */
 
 /*
@@ -137,7 +137,7 @@ extern int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pf
 #define PROCFS_LOCKED	0x01
 #define PROCFS_WANT	0x02
 
-extern int (**procfs_vnodeop_p)();
+extern vop_t **procfs_vnodeop_p;
 extern struct vfsops procfs_vfsops;
 
 int	procfs_root __P((struct mount *, struct vnode **));
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index c421569..fa3f0d4 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- *	$Id: procfs_vnops.c,v 1.16 1995/09/02 18:28:48 mpp Exp $
+ *	$Id: procfs_vnops.c,v 1.17 1995/11/07 13:39:31 phk Exp $
  */
 
 /*
@@ -799,49 +799,49 @@ atopid(b, len)
 /*
  * procfs vnode operations.
  */
-int (**procfs_vnodeop_p)();
+vop_t **procfs_vnodeop_p;
 static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, procfs_lookup },		/* lookup */
-	{ &vop_create_desc, procfs_create },		/* create */
-	{ &vop_mknod_desc, procfs_mknod },		/* mknod */
-	{ &vop_open_desc, procfs_open },		/* open */
-	{ &vop_close_desc, procfs_close },		/* close */
-	{ &vop_access_desc, procfs_access },		/* access */
-	{ &vop_getattr_desc, procfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, procfs_setattr },		/* setattr */
-	{ &vop_read_desc, procfs_read },		/* read */
-	{ &vop_write_desc, procfs_write },		/* write */
-	{ &vop_ioctl_desc, procfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, procfs_select },		/* select */
-	{ &vop_mmap_desc, procfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, procfs_fsync },		/* fsync */
-	{ &vop_seek_desc, procfs_seek },		/* seek */
-	{ &vop_remove_desc, procfs_remove },		/* remove */
-	{ &vop_link_desc, procfs_link },		/* link */
-	{ &vop_rename_desc, procfs_rename },		/* rename */
-	{ &vop_mkdir_desc, procfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, procfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, procfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, procfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, procfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, procfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, procfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, procfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, procfs_lock },		/* lock */
-	{ &vop_unlock_desc, procfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, procfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, procfs_strategy },	/* strategy */
-	{ &vop_print_desc, procfs_print },		/* print */
-	{ &vop_islocked_desc, procfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, procfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, procfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, procfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, procfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, procfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, procfs_truncate },	/* truncate */
-	{ &vop_update_desc, procfs_update },		/* update */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)procfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)procfs_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)procfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)procfs_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)procfs_mmap },		/* mmap */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)procfs_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)procfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)procfs_update },		/* update */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc procfs_vnodeop_opv_desc =
 	{ &procfs_vnodeop_p, procfs_vnodeop_entries };
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index c7430b5..b9ed634 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.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.15 1995/10/06 09:47:58 phk Exp $
+ * $Id: spec_vnops.c,v 1.16 1995/10/23 02:22:47 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -51,51 +51,51 @@
 #include <miscfs/specfs/specdev.h>
 
 struct vnode *speclisth[SPECHSZ];
-int (**spec_vnodeop_p)();
+vop_t **spec_vnodeop_p;
 struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, spec_close },		/* close */
-	{ &vop_access_desc, spec_access },		/* access */
-	{ &vop_getattr_desc, spec_getattr },		/* getattr */
-	{ &vop_setattr_desc, spec_setattr },		/* setattr */
-	{ &vop_read_desc, spec_read },			/* read */
-	{ &vop_write_desc, spec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, spec_inactive },		/* inactive */
-	{ &vop_reclaim_desc, spec_reclaim },		/* reclaim */
-	{ &vop_lock_desc, spec_lock },			/* lock */
-	{ &vop_unlock_desc, spec_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, spec_print },		/* print */
-	{ &vop_islocked_desc, spec_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
-	{ &vop_getpages_desc, spec_getpages},		/* getpages */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &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_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &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 */
+	{ &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_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc spec_vnodeop_opv_desc =
 	{ &spec_vnodeop_p, spec_vnodeop_entries };
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 5be2e5e..ad78ccd 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $
+ * $Id: umap.h,v 1.3 1995/05/30 08:07:15 rgrimes Exp $
  */
 
 #define MAPFILEENTRIES 64
@@ -87,6 +87,6 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp)
 #endif
 
-extern int (**umap_vnodeop_p)();
+extern vop_t **umap_vnodeop_p;
 extern struct vfsops umap_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index a82d1c6..1d2d586 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.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $
+ * $Id: umap_vnops.c,v 1.9 1995/05/30 08:07:22 rgrimes Exp $
  */
 
 /*
@@ -471,20 +471,20 @@ umap_rename(ap)
  * go away with a merged buffer/block cache.
  *
  */
-int (**umap_vnodeop_p)();
+vop_t **umap_vnodeop_p;
 struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
-	{ &vop_default_desc, umap_bypass },
+	{ &vop_default_desc, (vop_t *)umap_bypass },
 
-	{ &vop_getattr_desc, umap_getattr },
-	{ &vop_inactive_desc, umap_inactive },
-	{ &vop_reclaim_desc, umap_reclaim },
-	{ &vop_print_desc, umap_print },
-	{ &vop_rename_desc, umap_rename },
+	{ &vop_getattr_desc, (vop_t *)umap_getattr },
+	{ &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, umap_strategy },
-	{ &vop_bwrite_desc, umap_bwrite },
+	{ &vop_strategy_desc, (vop_t *)umap_strategy },
+	{ &vop_bwrite_desc, (vop_t *)umap_bwrite },
 
-	{ (struct vnodeop_desc*) NULL, (int(*)()) NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc umap_vnodeop_opv_desc =
 	{ &umap_vnodeop_p, umap_vnodeop_entries };
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 05fa481..55c1c87 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
- * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $
+ * $Id: union.h,v 1.3 1995/03/16 18:14:02 bde Exp $
  */
 
 struct union_args {
@@ -116,6 +116,6 @@ extern void union_newupper __P((struct union_node *, struct vnode *));
 #define	UPPERVP(vp) (VTOUNION(vp)->un_uppervp)
 #define OTHERVP(vp) (UPPERVP(vp) ? UPPERVP(vp) : LOWERVP(vp))
 
-extern int (**union_vnodeop_p)();
+extern vop_t **union_vnodeop_p;
 extern struct vfsops union_vfsops;
 #endif /* KERNEL */
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 04db44f..3955414 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.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.11 1995/08/17 11:53:51 bde Exp $
+ * $Id: union_vnops.c,v 1.12 1995/09/04 00:20:41 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -1452,52 +1452,52 @@ union_strategy(ap)
 /*
  * Global vfs data structures
  */
-int (**union_vnodeop_p)();
+vop_t **union_vnodeop_p;
 struct vnodeopv_entry_desc union_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, union_lookup },		/* lookup */
-	{ &vop_create_desc, union_create },		/* create */
-	{ &vop_mknod_desc, union_mknod },		/* mknod */
-	{ &vop_open_desc, union_open },			/* open */
-	{ &vop_close_desc, union_close },		/* close */
-	{ &vop_access_desc, union_access },		/* access */
-	{ &vop_getattr_desc, union_getattr },		/* getattr */
-	{ &vop_setattr_desc, union_setattr },		/* setattr */
-	{ &vop_read_desc, union_read },			/* read */
-	{ &vop_write_desc, union_write },		/* write */
-	{ &vop_ioctl_desc, union_ioctl },		/* ioctl */
-	{ &vop_select_desc, union_select },		/* select */
-	{ &vop_mmap_desc, union_mmap },			/* mmap */
-	{ &vop_fsync_desc, union_fsync },		/* fsync */
-	{ &vop_seek_desc, union_seek },			/* seek */
-	{ &vop_remove_desc, union_remove },		/* remove */
-	{ &vop_link_desc, union_link },			/* link */
-	{ &vop_rename_desc, union_rename },		/* rename */
-	{ &vop_mkdir_desc, union_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, union_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, union_symlink },		/* symlink */
-	{ &vop_readdir_desc, union_readdir },		/* readdir */
-	{ &vop_readlink_desc, union_readlink },		/* readlink */
-	{ &vop_abortop_desc, union_abortop },		/* abortop */
-	{ &vop_inactive_desc, union_inactive },		/* inactive */
-	{ &vop_reclaim_desc, union_reclaim },		/* reclaim */
-	{ &vop_lock_desc, union_lock },			/* lock */
-	{ &vop_unlock_desc, union_unlock },		/* unlock */
-	{ &vop_bmap_desc, union_bmap },			/* bmap */
-	{ &vop_strategy_desc, union_strategy },		/* strategy */
-	{ &vop_print_desc, union_print },		/* print */
-	{ &vop_islocked_desc, union_islocked },		/* islocked */
-	{ &vop_pathconf_desc, union_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, union_advlock },		/* advlock */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)union_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)union_create },		/* create */
+	{ &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_ioctl_desc, (vop_t *)union_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)union_select },		/* select */
+	{ &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, union_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, union_valloc },		/* valloc */
-	{ &vop_vfree_desc, union_vfree },		/* vfree */
-	{ &vop_truncate_desc, union_truncate },		/* truncate */
-	{ &vop_update_desc, union_update },		/* update */
-	{ &vop_bwrite_desc, union_bwrite },		/* bwrite */
+	{ &vop_blkatoff_desc, (vop_t *)union_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)union_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)union_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)union_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)union_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)union_bwrite },		/* bwrite */
 #endif
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc union_vnodeop_opv_desc =
 	{ &union_vnodeop_p, union_vnodeop_entries };
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index 917c277..6c53aaa 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -131,10 +131,10 @@ void	ext2_checkoverlap __P((struct buf *, struct inode *));
 #endif
 __END_DECLS
 
-extern int (**ext2_vnodeop_p)();
-extern int (**ext2_specop_p)();
+extern vop_t **ext2_vnodeop_p;
+extern vop_t **ext2_specop_p;
 #ifdef FIFO
-extern int (**ext2_fifoop_p)();
+extern vop_t **ext2_fifoop_p;
 #define EXT2_FIFOOPS ext2_fifoop_p
 #else
 #define EXT2_FIFOOPS NULL
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index bc33458..589c5cb 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -79,150 +79,150 @@
 #include <gnu/ext2fs/ext2_extern.h>
 
 /* Global vfs data structures for ufs. */
-int (**ext2_vnodeop_p)();
+vop_t **ext2_vnodeop_p;
 struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, ext2_lookup },		/* lookup */
-	{ &vop_create_desc, ufs_create },		/* create */
-	{ &vop_mknod_desc, ufs_mknod },			/* mknod */
-	{ &vop_open_desc, ufs_open },			/* open */
-	{ &vop_close_desc, ufs_close },			/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ext2_read },			/* read */
-	{ &vop_write_desc, ext2_write },		/* write */
-	{ &vop_ioctl_desc, ufs_ioctl },			/* ioctl */
-	{ &vop_select_desc, ufs_select },		/* select */
-	{ &vop_mmap_desc, ufs_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, ufs_seek },			/* seek */
-	{ &vop_remove_desc, ufs_remove },		/* remove */
-	{ &vop_link_desc, ufs_link },			/* link */
-	{ &vop_rename_desc, ufs_rename },		/* rename */
-	{ &vop_mkdir_desc, ufs_mkdir },			/* mkdir */
-	{ &vop_rmdir_desc, ufs_rmdir },			/* rmdir */
-	{ &vop_symlink_desc, ufs_symlink },		/* symlink */
-	{ &vop_readdir_desc, ext2_readdir },		/* readdir */
-	{ &vop_readlink_desc, ufs_readlink },		/* readlink */
-	{ &vop_abortop_desc, ufs_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, ufs_bmap },			/* bmap */
-	{ &vop_strategy_desc, ufs_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, ufs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, ufs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, ext2_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, ext2_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, ext2_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, ext2_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)ext2_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)ufs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ext2_read },		/* read */
+	{ &vop_write_desc, (vop_t *)ext2_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)ufs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)ufs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)ufs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)ufs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)ufs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)ufs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)ext2_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)ufs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)ufs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)ufs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)ufs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)ufs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)ufs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)ext2_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)ext2_valloc },	/* valloc */
+	{ &vop_reallocblks_desc, (vop_t *)ext2_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)ext2_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
 	{ &ext2_vnodeop_p, ext2_vnodeop_entries };
 
-int (**ext2_specop_p)();
+vop_t **ext2_specop_p;
 struct vnodeopv_entry_desc ext2_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, ufsspec_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsspec_read },		/* read */
-	{ &vop_write_desc, ufsspec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_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 *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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 */
+	{ &vop_reallocblks_desc, (vop_t *)spec_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_specop_opv_desc =
 	{ &ext2_specop_p, ext2_specop_entries };
 
 #if FIFO
-int (**ext2_fifoop_p)();
+vop_t **ext2_fifoop_p;
 struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, ufsfifo_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsfifo_read },		/* read */
-	{ &vop_write_desc, ufsfifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)ufsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_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 *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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_reallocblks_desc, (vop_t *)fifo_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_fifoop_opv_desc =
 	{ &ext2_fifoop_p, ext2_fifoop_entries };
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index 917c277..6c53aaa 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -131,10 +131,10 @@ void	ext2_checkoverlap __P((struct buf *, struct inode *));
 #endif
 __END_DECLS
 
-extern int (**ext2_vnodeop_p)();
-extern int (**ext2_specop_p)();
+extern vop_t **ext2_vnodeop_p;
+extern vop_t **ext2_specop_p;
 #ifdef FIFO
-extern int (**ext2_fifoop_p)();
+extern vop_t **ext2_fifoop_p;
 #define EXT2_FIFOOPS ext2_fifoop_p
 #else
 #define EXT2_FIFOOPS NULL
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index bc33458..589c5cb 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -79,150 +79,150 @@
 #include <gnu/ext2fs/ext2_extern.h>
 
 /* Global vfs data structures for ufs. */
-int (**ext2_vnodeop_p)();
+vop_t **ext2_vnodeop_p;
 struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, ext2_lookup },		/* lookup */
-	{ &vop_create_desc, ufs_create },		/* create */
-	{ &vop_mknod_desc, ufs_mknod },			/* mknod */
-	{ &vop_open_desc, ufs_open },			/* open */
-	{ &vop_close_desc, ufs_close },			/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ext2_read },			/* read */
-	{ &vop_write_desc, ext2_write },		/* write */
-	{ &vop_ioctl_desc, ufs_ioctl },			/* ioctl */
-	{ &vop_select_desc, ufs_select },		/* select */
-	{ &vop_mmap_desc, ufs_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, ufs_seek },			/* seek */
-	{ &vop_remove_desc, ufs_remove },		/* remove */
-	{ &vop_link_desc, ufs_link },			/* link */
-	{ &vop_rename_desc, ufs_rename },		/* rename */
-	{ &vop_mkdir_desc, ufs_mkdir },			/* mkdir */
-	{ &vop_rmdir_desc, ufs_rmdir },			/* rmdir */
-	{ &vop_symlink_desc, ufs_symlink },		/* symlink */
-	{ &vop_readdir_desc, ext2_readdir },		/* readdir */
-	{ &vop_readlink_desc, ufs_readlink },		/* readlink */
-	{ &vop_abortop_desc, ufs_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, ufs_bmap },			/* bmap */
-	{ &vop_strategy_desc, ufs_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, ufs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, ufs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, ext2_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, ext2_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, ext2_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, ext2_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)ext2_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)ufs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ext2_read },		/* read */
+	{ &vop_write_desc, (vop_t *)ext2_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)ufs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)ufs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)ufs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)ufs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)ufs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)ufs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)ext2_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)ufs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)ufs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)ufs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)ufs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)ufs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)ufs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)ext2_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)ext2_valloc },	/* valloc */
+	{ &vop_reallocblks_desc, (vop_t *)ext2_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)ext2_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
 	{ &ext2_vnodeop_p, ext2_vnodeop_entries };
 
-int (**ext2_specop_p)();
+vop_t **ext2_specop_p;
 struct vnodeopv_entry_desc ext2_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, ufsspec_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsspec_read },		/* read */
-	{ &vop_write_desc, ufsspec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_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 *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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 */
+	{ &vop_reallocblks_desc, (vop_t *)spec_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_specop_opv_desc =
 	{ &ext2_specop_p, ext2_specop_entries };
 
 #if FIFO
-int (**ext2_fifoop_p)();
+vop_t **ext2_fifoop_p;
 struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, ufsfifo_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsfifo_read },		/* read */
-	{ &vop_write_desc, ufsfifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, ext2_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, ext2_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ext2_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, ext2_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)ufsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ext2_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 *)ext2_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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_reallocblks_desc, (vop_t *)fifo_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ext2_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ext2_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ext2fs_fifoop_opv_desc =
 	{ &ext2_fifoop_p, ext2_fifoop_entries };
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 479ad34..4f0c98d 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.h,v 1.5 1995/03/16 18:12:16 bde Exp $
+ * $Id: cd9660_node.h,v 1.6 1995/10/31 12:13:44 phk Exp $
  */
 
 /*
@@ -111,8 +111,8 @@ struct iso_node {
 #define ISO_ILOCK(ip)	iso_ilock(ip)
 #define ISO_IUNLOCK(ip)	iso_iunlock(ip)
 
-extern int	(**cd9660_fifoop_p)();
-extern int	(**cd9660_specop_p)();
+extern vop_t	**cd9660_fifoop_p;
+extern vop_t	**cd9660_specop_p;
 
 /*
  * Prototypes for ISOFS vnode operations
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index e2e8df2..074de85 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.17 1995/10/23 02:22:34 dyson Exp $
+ * $Id: cd9660_vnops.c,v 1.18 1995/10/31 12:13:47 phk Exp $
  */
 
 #include <sys/param.h>
@@ -929,50 +929,50 @@ cd9660_enotsupp()
 /*
  * Global vfs data structures for nfs
  */
-int (**cd9660_vnodeop_p)();
+vop_t **cd9660_vnodeop_p;
 static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, cd9660_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, cd9660_open },	/* open */
-	{ &vop_close_desc, cd9660_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, cd9660_read },	/* read */
-	{ &vop_write_desc, cd9660_write },	/* write */
-	{ &vop_ioctl_desc, cd9660_ioctl },	/* ioctl */
-	{ &vop_select_desc, cd9660_select },	/* select */
-	{ &vop_mmap_desc, cd9660_mmap },	/* mmap */
-	{ &vop_fsync_desc, cd9660_fsync },	/* fsync */
-	{ &vop_seek_desc, cd9660_seek },	/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, cd9660_readdir },	/* readdir */
-	{ &vop_readlink_desc, cd9660_readlink },/* readlink */
-	{ &vop_abortop_desc, cd9660_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, cd9660_bmap },	/* bmap */
-	{ &vop_strategy_desc, cd9660_strategy },/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
-	{ &vop_advlock_desc, cd9660_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, cd9660_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, cd9660_valloc },	/* valloc */
-	{ &vop_vfree_desc, cd9660_vfree },	/* vfree */
-	{ &vop_truncate_desc, cd9660_truncate },/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)cd9660_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &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_ioctl_desc, (vop_t *)cd9660_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)cd9660_select },		/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 	{ &cd9660_vnodeop_p, cd9660_vnodeop_entries };
@@ -981,100 +981,100 @@ VNODEOP_SET(cd9660_vnodeop_opv_desc);
 /*
  * Special device vnode ops
  */
-int (**cd9660_specop_p)();
+vop_t **cd9660_specop_p;
 static struct vnodeopv_entry_desc cd9660_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, spec_open },		/* open */
-	{ &vop_close_desc, spec_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, spec_read },		/* read */
-	{ &vop_write_desc, spec_write },	/* write */
-	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, spec_select },	/* select */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, spec_fsync },	/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, spec_strategy },  /* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
- 	{ &vop_getpages_desc, spec_getpages},
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_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_ioctl_desc, (vop_t *)spec_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },		/* select */
+	{ &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 *)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 *)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 */
+	{ &vop_vfree_desc, (vop_t *)spec_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+ 	{ &vop_getpages_desc, (vop_t *)spec_getpages},		/* getpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 VNODEOP_SET(cd9660_specop_opv_desc);
 
-int (**cd9660_fifoop_p)();
+vop_t **cd9660_fifoop_p;
 static struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
-	{ &vop_create_desc, cd9660_create },	/* create */
-	{ &vop_mknod_desc, cd9660_mknod },	/* mknod */
-	{ &vop_open_desc, fifo_open },		/* open */
-	{ &vop_close_desc, fifo_close },	/* close */
-	{ &vop_access_desc, cd9660_access },	/* access */
-	{ &vop_getattr_desc, cd9660_getattr },	/* getattr */
-	{ &vop_setattr_desc, cd9660_setattr },	/* setattr */
-	{ &vop_read_desc, fifo_read },		/* read */
-	{ &vop_write_desc, fifo_write },	/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, fifo_select },	/* select */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },	/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
-	{ &vop_remove_desc, cd9660_remove },	/* remove */
-	{ &vop_link_desc, cd9660_link },	/* link */
-	{ &vop_rename_desc, cd9660_rename },	/* rename */
-	{ &vop_mkdir_desc, cd9660_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, cd9660_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, cd9660_symlink },	/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, cd9660_inactive },/* inactive */
-	{ &vop_reclaim_desc, cd9660_reclaim },	/* reclaim */
-	{ &vop_lock_desc, cd9660_lock },	/* lock */
-	{ &vop_unlock_desc, cd9660_unlock },	/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, fifo_badop },	/* strategy */
-	{ &vop_print_desc, cd9660_print },	/* print */
-	{ &vop_islocked_desc, cd9660_islocked },/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, cd9660_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)cd9660_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)cd9660_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_ioctl_desc, (vop_t *)fifo_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },		/* select */
+	{ &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 *)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 *)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_badop },		/* 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 */
+	{ &vop_vfree_desc, (vop_t *)fifo_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },		/* truncate */
+	{ &vop_update_desc, (vop_t *)cd9660_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index bf5c44c..fa9e2c0 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.6 1995/07/25 21:50:50 bde Exp $
+ * $Id: iso.h,v 1.7 1995/10/31 12:13:49 phk Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -223,7 +223,7 @@ int iso_ilock __P((struct iso_node *ip));
 int iso_iunlock __P((struct iso_node *ip));
 int cd9660_mountroot __P((void));
 
-extern int (**cd9660_vnodeop_p)();
+extern vop_t **cd9660_vnodeop_p;
 
 static inline int
 isonum_711(p)
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 8e40e66..32cdf70 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.37 1995/10/28 08:50:08 bde Exp $
+ * $Id: vfs_subr.c,v 1.38 1995/11/07 05:09:43 dyson Exp $
  */
 
 /*
@@ -312,7 +312,7 @@ vattr_null(vap)
 /*
  * Routines having to do with the management of the vnode table.
  */
-extern int (**dead_vnodeop_p) ();
+extern vop_t **dead_vnodeop_p;
 extern void vclean();
 
 /*
@@ -322,7 +322,7 @@ int
 getnewvnode(tag, mp, vops, vpp)
 	enum vtagtype tag;
 	struct mount *mp;
-	int (**vops) ();
+	vop_t **vops;
 	struct vnode **vpp;
 {
 	register struct vnode *vp;
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 4cecaf1..5c98182 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.11 1995/08/28 09:18:55 julian Exp $
+ * $Id: vfs_init.c,v 1.12 1995/09/09 18:10:16 davidg Exp $
  */
 
 
@@ -91,8 +91,6 @@ extern struct vnodeop_desc *vfs_op_descs[];
  */
 int vfs_opv_numops;
 
-typedef int (*PFI)(); /* the standard Pointer to a Function returning an Int */
-
 /*
  * A miscellaneous routine.
  * A generic "default" routine that just returns an error.
@@ -124,8 +122,8 @@ void
 vfs_opv_init(struct vnodeopv_desc **them)
 {
 	int i, j, k;
-	int (***opv_desc_vector_p)();
-	int (**opv_desc_vector)();
+	vop_t ***opv_desc_vector_p;
+	vop_t **opv_desc_vector;
 	struct vnodeopv_entry_desc *opve_descp;
 
 	/*
@@ -139,9 +137,11 @@ vfs_opv_init(struct vnodeopv_desc **them)
 		 */
 		if (*opv_desc_vector_p == NULL) {
 			/* XXX - shouldn't be M_VNODE */
-			MALLOC(*opv_desc_vector_p, PFI*,
-			       vfs_opv_numops*sizeof(PFI), M_VNODE, M_WAITOK);
-			bzero (*opv_desc_vector_p, vfs_opv_numops*sizeof(PFI));
+			MALLOC(*opv_desc_vector_p, vop_t **,
+			       vfs_opv_numops * sizeof(vop_t *), M_VNODE,
+			       M_WAITOK);
+			bzero(*opv_desc_vector_p,
+			      vfs_opv_numops * sizeof(vop_t *));
 			DODEBUG(printf("vector at %x allocated\n",
 			    opv_desc_vector_p));
 		}
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 8e40e66..32cdf70 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.37 1995/10/28 08:50:08 bde Exp $
+ * $Id: vfs_subr.c,v 1.38 1995/11/07 05:09:43 dyson Exp $
  */
 
 /*
@@ -312,7 +312,7 @@ vattr_null(vap)
 /*
  * Routines having to do with the management of the vnode table.
  */
-extern int (**dead_vnodeop_p) ();
+extern vop_t **dead_vnodeop_p;
 extern void vclean();
 
 /*
@@ -322,7 +322,7 @@ int
 getnewvnode(tag, mp, vops, vpp)
 	enum vtagtype tag;
 	struct mount *mp;
-	int (**vops) ();
+	vop_t **vops;
 	struct vnode **vpp;
 {
 	register struct vnode *vp;
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 56a33bc..55534d1 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/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.6 1994/10/08 22:37:00 phk Exp $
+ * $Id: dead_vnops.c,v 1.7 1995/09/04 00:20:26 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -91,50 +91,50 @@ int	dead_print __P((struct vop_print_args *));
 #define dead_update ((int (*) __P((struct  vop_update_args *)))nullop)
 #define dead_bwrite ((int (*) __P((struct  vop_bwrite_args *)))nullop)
 
-int (**dead_vnodeop_p)();
+vop_t **dead_vnodeop_p;
 struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, dead_lookup },	/* lookup */
-	{ &vop_create_desc, dead_create },	/* create */
-	{ &vop_mknod_desc, dead_mknod },	/* mknod */
-	{ &vop_open_desc, dead_open },	/* open */
-	{ &vop_close_desc, dead_close },	/* close */
-	{ &vop_access_desc, dead_access },	/* access */
-	{ &vop_getattr_desc, dead_getattr },	/* getattr */
-	{ &vop_setattr_desc, dead_setattr },	/* setattr */
-	{ &vop_read_desc, dead_read },	/* read */
-	{ &vop_write_desc, dead_write },	/* write */
-	{ &vop_ioctl_desc, dead_ioctl },	/* ioctl */
-	{ &vop_select_desc, dead_select },	/* select */
-	{ &vop_mmap_desc, dead_mmap },	/* mmap */
-	{ &vop_fsync_desc, dead_fsync },	/* fsync */
-	{ &vop_seek_desc, dead_seek },	/* seek */
-	{ &vop_remove_desc, dead_remove },	/* remove */
-	{ &vop_link_desc, dead_link },	/* link */
-	{ &vop_rename_desc, dead_rename },	/* rename */
-	{ &vop_mkdir_desc, dead_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, dead_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, dead_symlink },	/* symlink */
-	{ &vop_readdir_desc, dead_readdir },	/* readdir */
-	{ &vop_readlink_desc, dead_readlink },	/* readlink */
-	{ &vop_abortop_desc, dead_abortop },	/* abortop */
-	{ &vop_inactive_desc, dead_inactive },	/* inactive */
-	{ &vop_reclaim_desc, dead_reclaim },	/* reclaim */
-	{ &vop_lock_desc, dead_lock },	/* lock */
-	{ &vop_unlock_desc, dead_unlock },	/* unlock */
-	{ &vop_bmap_desc, dead_bmap },	/* bmap */
-	{ &vop_strategy_desc, dead_strategy },	/* strategy */
-	{ &vop_print_desc, dead_print },	/* print */
-	{ &vop_islocked_desc, dead_islocked },	/* islocked */
-	{ &vop_pathconf_desc, dead_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, dead_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, dead_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, dead_valloc },	/* valloc */
-	{ &vop_vfree_desc, dead_vfree },	/* vfree */
-	{ &vop_truncate_desc, dead_truncate },	/* truncate */
-	{ &vop_update_desc, dead_update },	/* update */
-	{ &vop_bwrite_desc, dead_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)dead_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)dead_create },	/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)dead_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)dead_select },	/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)dead_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)dead_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)dead_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)dead_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc dead_vnodeop_opv_desc =
 	{ &dead_vnodeop_p, dead_vnodeop_entries };
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 58adaf0..a6a40eb 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.14 1995/10/04 11:05:07 julian Exp $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.15 1995/10/10 07:12:27 julian Exp $
  *
  * symlinks can wait 'til later.
  */
@@ -1634,50 +1634,50 @@ void	devfs_dropvnode(dn_p dnp) /*proto*/
 
 /* These are the operations used by directories etc in a devfs */
 
-int (**devfs_vnodeop_p)(void *);
+vop_t **devfs_vnodeop_p;
 struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, devfs_lookup },	/* lookup */
-	{ &vop_create_desc, devfs_create },	/* create */
-	{ &vop_mknod_desc, devfs_mknod },	/* mknod */
-	{ &vop_open_desc, devfs_open },		/* open */
-	{ &vop_close_desc, devfs_close },	/* close */
-	{ &vop_access_desc, devfs_access },	/* access */
-	{ &vop_getattr_desc, devfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, devfs_setattr },	/* setattr */
-	{ &vop_read_desc, devfs_read },		/* read */
-	{ &vop_write_desc, devfs_write },	/* write */
-	{ &vop_ioctl_desc, devfs_ioctl },	/* ioctl */
-	{ &vop_select_desc, devfs_select },	/* select */
-	{ &vop_mmap_desc, devfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, devfs_fsync },	/* fsync */
-	{ &vop_seek_desc, devfs_seek },		/* seek */
-	{ &vop_remove_desc, devfs_remove },	/* remove */
-	{ &vop_link_desc, devfs_link },		/* link */
-	{ &vop_rename_desc, devfs_rename },	/* rename */
-	{ &vop_mkdir_desc, devfs_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, devfs_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, devfs_symlink },	/* symlink */
-	{ &vop_readdir_desc, devfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, devfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, devfs_abortop },	/* abortop */
-	{ &vop_inactive_desc, devfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, devfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, devfs_lock },		/* lock */
-	{ &vop_unlock_desc, devfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, devfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, devfs_strategy },	/* strategy */
-	{ &vop_print_desc, devfs_print },	/* print */
-	{ &vop_islocked_desc, devfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, devfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, devfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, devfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, devfs_valloc },	/* valloc */
-	{ &vop_vfree_desc, devfs_vfree },	/* vfree */
-	{ &vop_truncate_desc, devfs_truncate },	/* truncate */
-	{ &vop_update_desc, devfs_update },	/* update */
-	{ &vop_bwrite_desc, devfs_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)devfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)devfs_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)devfs_mknod },		/* mknod */
+	{ &vop_open_desc, (vop_t *)devfs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)devfs_close },		/* close */
+	{ &vop_access_desc, (vop_t *)devfs_access },		/* access */
+	{ &vop_getattr_desc, (vop_t *)devfs_getattr },		/* getattr */
+	{ &vop_setattr_desc, (vop_t *)devfs_setattr },		/* setattr */
+	{ &vop_read_desc, (vop_t *)devfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)devfs_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)devfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)devfs_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)devfs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)devfs_fsync },		/* fsync */
+	{ &vop_seek_desc, (vop_t *)devfs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)devfs_remove },		/* remove */
+	{ &vop_link_desc, (vop_t *)devfs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)devfs_rename },		/* rename */
+	{ &vop_mkdir_desc, (vop_t *)devfs_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)devfs_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)devfs_symlink },		/* symlink */
+	{ &vop_readdir_desc, (vop_t *)devfs_readdir },		/* readdir */
+	{ &vop_readlink_desc, (vop_t *)devfs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)devfs_abortop },		/* abortop */
+	{ &vop_inactive_desc, (vop_t *)devfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)devfs_reclaim },		/* reclaim */
+	{ &vop_lock_desc, (vop_t *)devfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)devfs_unlock },		/* unlock */
+	{ &vop_bmap_desc, (vop_t *)devfs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)devfs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)devfs_print },		/* print */
+	{ &vop_islocked_desc, (vop_t *)devfs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)devfs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)devfs_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)devfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)devfs_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)devfs_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)devfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)devfs_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)devfs_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc devfs_vnodeop_opv_desc =
 	{ &devfs_vnodeop_p, devfs_vnodeop_entries };
@@ -1724,50 +1724,50 @@ VNODEOP_SET(devfs_vnodeop_opv_desc);
  */
 
 
-int (**dev_spec_vnodeop_p)(void *);
+vop_t **dev_spec_vnodeop_p;
 struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, spec_close },		/* close */
-	{ &vop_access_desc, devfs_access },		/* access */
-	{ &vop_getattr_desc, devfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, devfs_setattr },		/* setattr */
-	{ &vop_read_desc, spec_read },			/* read */
-	{ &vop_write_desc, spec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, spec_inactive },		/* inactive */
-	{ &vop_reclaim_desc, spec_reclaim },		/* reclaim */
-	{ &vop_lock_desc, spec_lock },			/* lock */
-	{ &vop_unlock_desc, spec_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, spec_print },		/* print */
-	{ &vop_islocked_desc, spec_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
-	{ &vop_bwrite_desc, spec_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &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 *)devfs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)devfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)devfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)spec_read },		/* read */
+	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &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 */
+	{ &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_bwrite_desc, (vop_t *)spec_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc dev_spec_vnodeop_opv_desc =
 	{ &dev_spec_vnodeop_p, dev_spec_vnodeop_entries };
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index 6973a98..1a64047 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -7,7 +7,7 @@
 /*
  * Written by Julian Elischer (julian@DIALIX.oz.au)
  *
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.6 1995/09/06 23:15:55 julian Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.7 1995/10/04 11:05:09 julian Exp $
  */
 
 /* first a couple of defines for compatibility with inodes */
@@ -68,8 +68,8 @@
 #define DEV_SLNK 6
 
 
-extern int (**devfs_vnodeop_p)(void *);	/* our own vector array for dirs */
-extern int (**dev_spec_vnodeop_p)(void *);	/* our own vector array for devs */
+extern vop_t **devfs_vnodeop_p;		/* our own vector array for dirs */
+extern vop_t **dev_spec_vnodeop_p;	/* our own vector array for devs */
 
 typedef struct dev_name *devnm_p;
 typedef	struct devnode	*dn_p;
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index 4c682e7..3214004 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp $
+ * $Id: fdesc.h,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $
  */
 
 #ifdef KERNEL
@@ -77,6 +77,6 @@ extern dev_t devctty;
 extern int fdesc_init __P((void));
 extern int fdesc_root __P((struct mount *, struct vnode **));
 extern int fdesc_allocvp __P((fdntype, int, struct mount *, struct vnode **));
-extern int (**fdesc_vnodeop_p)();
+extern vop_t **fdesc_vnodeop_p;
 extern struct vfsops fdesc_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 3c334bb..5f2010b 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.10 1995/09/02 20:19:12 mpp Exp $
+ * $Id: fdesc_vnops.c,v 1.11 1995/11/07 13:39:20 phk Exp $
  */
 
 /*
@@ -936,50 +936,50 @@ fdesc_nullop()
 #define fdesc_update ((int (*) __P((struct  vop_update_args *)))fdesc_enotsupp)
 #define fdesc_bwrite ((int (*) __P((struct  vop_bwrite_args *)))fdesc_enotsupp)
 
-static int (**fdesc_vnodeop_p)();
+static vop_t **fdesc_vnodeop_p;
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fdesc_lookup },	/* lookup */
-	{ &vop_create_desc, fdesc_create },	/* create */
-	{ &vop_mknod_desc, fdesc_mknod },	/* mknod */
-	{ &vop_open_desc, fdesc_open },		/* open */
-	{ &vop_close_desc, fdesc_close },	/* close */
-	{ &vop_access_desc, fdesc_access },	/* access */
-	{ &vop_getattr_desc, fdesc_getattr },	/* getattr */
-	{ &vop_setattr_desc, fdesc_setattr },	/* setattr */
-	{ &vop_read_desc, fdesc_read },		/* read */
-	{ &vop_write_desc, fdesc_write },	/* write */
-	{ &vop_ioctl_desc, fdesc_ioctl },	/* ioctl */
-	{ &vop_select_desc, fdesc_select },	/* select */
-	{ &vop_mmap_desc, fdesc_mmap },		/* mmap */
-	{ &vop_fsync_desc, fdesc_fsync },	/* fsync */
-	{ &vop_seek_desc, fdesc_seek },		/* seek */
-	{ &vop_remove_desc, fdesc_remove },	/* remove */
-	{ &vop_link_desc, fdesc_link },		/* link */
-	{ &vop_rename_desc, fdesc_rename },	/* rename */
-	{ &vop_mkdir_desc, fdesc_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, fdesc_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, fdesc_symlink },	/* symlink */
-	{ &vop_readdir_desc, fdesc_readdir },	/* readdir */
-	{ &vop_readlink_desc, fdesc_readlink },	/* readlink */
-	{ &vop_abortop_desc, fdesc_abortop },	/* abortop */
-	{ &vop_inactive_desc, fdesc_inactive },	/* inactive */
-	{ &vop_reclaim_desc, fdesc_reclaim },	/* reclaim */
-	{ &vop_lock_desc, fdesc_lock },		/* lock */
-	{ &vop_unlock_desc, fdesc_unlock },	/* unlock */
-	{ &vop_bmap_desc, fdesc_bmap },		/* bmap */
-	{ &vop_strategy_desc, fdesc_strategy },	/* strategy */
-	{ &vop_print_desc, fdesc_print },	/* print */
-	{ &vop_islocked_desc, fdesc_islocked },	/* islocked */
-	{ &vop_pathconf_desc, fdesc_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fdesc_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fdesc_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fdesc_valloc },	/* valloc */
-	{ &vop_vfree_desc, fdesc_vfree },	/* vfree */
-	{ &vop_truncate_desc, fdesc_truncate },	/* truncate */
-	{ &vop_update_desc, fdesc_update },	/* update */
-	{ &vop_bwrite_desc, fdesc_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)fdesc_create },		/* create */
+	{ &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 */
+	{ &vop_write_desc, (vop_t *)fdesc_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)fdesc_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)fdesc_select },		/* select */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)fdesc_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fdesc_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)fdesc_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)fdesc_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc fdesc_vnodeop_opv_desc =
 	{ &fdesc_vnodeop_p, fdesc_vnodeop_entries };
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 3f2d8ef..5556626 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,10 +31,10 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $
+ * $Id: fifo.h,v 1.5 1995/03/16 18:13:13 bde Exp $
  */
 
-extern int	(**fifo_vnodeop_p)();
+extern vop_t **fifo_vnodeop_p;
 
 /*
  * Prototypes for fifo operations on vnodes.
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 8291ebb..dee76fb 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.10 1995/08/06 16:14:21 jkh Exp $
+ * $Id: fifo_vnops.c,v 1.11 1995/09/04 00:20:33 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -62,50 +62,50 @@ struct fifoinfo {
 	long		fi_writers;
 };
 
-int (**fifo_vnodeop_p)();
+vop_t **fifo_vnodeop_p;
 struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, fifo_close },		/* close */
-	{ &vop_access_desc, fifo_access },		/* access */
-	{ &vop_getattr_desc, fifo_getattr },		/* getattr */
-	{ &vop_setattr_desc, fifo_setattr },		/* setattr */
-	{ &vop_read_desc, fifo_read },			/* read */
-	{ &vop_write_desc, fifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, fifo_inactive },		/* inactive */
-	{ &vop_reclaim_desc, fifo_reclaim },		/* reclaim */
-	{ &vop_lock_desc, fifo_lock },			/* lock */
-	{ &vop_unlock_desc, fifo_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, fifo_print },		/* print */
-	{ &vop_islocked_desc, fifo_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, fifo_update },		/* update */
-	{ &vop_bwrite_desc, fifo_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &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 */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc fifo_vnodeop_opv_desc =
 	{ &fifo_vnodeop_p, fifo_vnodeop_entries };
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 2def608..873ee4e 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $Id: kernfs.h,v 1.2 1994/08/02 07:44:59 davidg Exp $
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
@@ -51,7 +51,7 @@ struct kernfs_node {
 #define VFSTOKERNFS(mp)	((struct kernfs_mount *)((mp)->mnt_data))
 #define	VTOKERN(vp) ((struct kernfs_node *)(vp)->v_data)
 
-extern int (**kernfs_vnodeop_p)();
+extern vop_t **kernfs_vnodeop_p;
 extern struct vfsops kernfs_vfsops;
 extern struct vnode *rrootvp;
 #endif /* KERNEL */
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 1a7c07f..e541588 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.6 (Berkeley) 2/10/94
- * $Id: kernfs_vnops.c,v 1.10 1995/07/31 09:52:21 mpp Exp $
+ * $Id: kernfs_vnops.c,v 1.11 1995/10/29 15:31:37 phk Exp $
  */
 
 /*
@@ -750,50 +750,50 @@ kernfs_badop()
 #define kernfs_update ((int (*) __P((struct  vop_update_args *)))kernfs_enotsupp)
 #define kernfs_bwrite ((int (*) __P((struct  vop_bwrite_args *)))kernfs_enotsupp)
 
-int (**kernfs_vnodeop_p)();
+vop_t **kernfs_vnodeop_p;
 static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, kernfs_lookup },	/* lookup */
-	{ &vop_create_desc, kernfs_create },	/* create */
-	{ &vop_mknod_desc, kernfs_mknod },	/* mknod */
-	{ &vop_open_desc, kernfs_open },	/* open */
-	{ &vop_close_desc, kernfs_close },	/* close */
-	{ &vop_access_desc, kernfs_access },	/* access */
-	{ &vop_getattr_desc, kernfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, kernfs_setattr },	/* setattr */
-	{ &vop_read_desc, kernfs_read },	/* read */
-	{ &vop_write_desc, kernfs_write },	/* write */
-	{ &vop_ioctl_desc, kernfs_ioctl },	/* ioctl */
-	{ &vop_select_desc, kernfs_select },	/* select */
-	{ &vop_mmap_desc, kernfs_mmap },	/* mmap */
-	{ &vop_fsync_desc, kernfs_fsync },	/* fsync */
-	{ &vop_seek_desc, kernfs_seek },	/* seek */
-	{ &vop_remove_desc, kernfs_remove },	/* remove */
-	{ &vop_link_desc, kernfs_link },	/* link */
-	{ &vop_rename_desc, kernfs_rename },	/* rename */
-	{ &vop_mkdir_desc, kernfs_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, kernfs_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, kernfs_symlink },	/* symlink */
-	{ &vop_readdir_desc, kernfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, kernfs_readlink },/* readlink */
-	{ &vop_abortop_desc, kernfs_abortop },	/* abortop */
-	{ &vop_inactive_desc, kernfs_inactive },/* inactive */
-	{ &vop_reclaim_desc, kernfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, kernfs_lock },	/* lock */
-	{ &vop_unlock_desc, kernfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, kernfs_bmap },	/* bmap */
-	{ &vop_strategy_desc, kernfs_strategy },/* strategy */
-	{ &vop_print_desc, kernfs_print },	/* print */
-	{ &vop_islocked_desc, kernfs_islocked },/* islocked */
-	{ &vop_pathconf_desc, kernfs_pathconf },/* pathconf */
-	{ &vop_advlock_desc, kernfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, kernfs_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, kernfs_valloc },	/* valloc */
-	{ &vop_vfree_desc, kernfs_vfree },	/* vfree */
-	{ &vop_truncate_desc, kernfs_truncate },/* truncate */
-	{ &vop_update_desc, kernfs_update },	/* update */
-	{ &vop_bwrite_desc, kernfs_bwrite },	/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)kernfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)kernfs_create },		/* create */
+	{ &vop_mknod_desc, (vop_t *)kernfs_mknod },		/* mknod */
+	{ &vop_open_desc, (vop_t *)kernfs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)kernfs_close },		/* close */
+	{ &vop_access_desc, (vop_t *)kernfs_access },		/* access */
+	{ &vop_getattr_desc, (vop_t *)kernfs_getattr },		/* getattr */
+	{ &vop_setattr_desc, (vop_t *)kernfs_setattr },		/* setattr */
+	{ &vop_read_desc, (vop_t *)kernfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)kernfs_write },		/* write */
+	{ &vop_ioctl_desc, (vop_t *)kernfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)kernfs_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)kernfs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)kernfs_fsync },		/* fsync */
+	{ &vop_seek_desc, (vop_t *)kernfs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)kernfs_remove },		/* remove */
+	{ &vop_link_desc, (vop_t *)kernfs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)kernfs_rename },		/* rename */
+	{ &vop_mkdir_desc, (vop_t *)kernfs_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)kernfs_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)kernfs_symlink },		/* symlink */
+	{ &vop_readdir_desc, (vop_t *)kernfs_readdir },		/* readdir */
+	{ &vop_readlink_desc, (vop_t *)kernfs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)kernfs_abortop },		/* abortop */
+	{ &vop_inactive_desc, (vop_t *)kernfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)kernfs_reclaim },		/* reclaim */
+	{ &vop_lock_desc, (vop_t *)kernfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)kernfs_unlock },		/* unlock */
+	{ &vop_bmap_desc, (vop_t *)kernfs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)kernfs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)kernfs_print },		/* print */
+	{ &vop_islocked_desc, (vop_t *)kernfs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)kernfs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)kernfs_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)kernfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)kernfs_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)kernfs_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)kernfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)kernfs_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)kernfs_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc kernfs_vnodeop_opv_desc =
 	{ &kernfs_vnodeop_p, kernfs_vnodeop_entries };
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 14286ff..f957249 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.2 (Berkeley) 1/21/94
  *
- * $Id: lofs.h,v 1.8 1992/05/30 10:05:43 jsp Exp jsp $
+ * $Id: null.h,v 1.1.1.1 1994/05/24 10:05:04 rgrimes Exp $
  */
 
 struct null_args {
@@ -70,6 +70,6 @@ extern struct vnode *null_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
 #endif
 
-extern int (**null_vnodeop_p)();
+extern vop_t **null_vnodeop_p;
 extern struct vfsops null_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 464d15a..41e9f70 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $
+ * $Id: null_vnops.c,v 1.8 1995/05/30 08:07:03 rgrimes Exp $
  */
 
 /*
@@ -441,19 +441,19 @@ null_bwrite(ap)
 /*
  * Global vfs data structures
  */
-int (**null_vnodeop_p)();
+vop_t **null_vnodeop_p;
 struct vnodeopv_entry_desc null_vnodeop_entries[] = {
-	{ &vop_default_desc, null_bypass },
+	{ &vop_default_desc, (vop_t *)null_bypass },
 
-	{ &vop_getattr_desc, null_getattr },
-	{ &vop_inactive_desc, null_inactive },
-	{ &vop_reclaim_desc, null_reclaim },
-	{ &vop_print_desc, null_print },
+	{ &vop_getattr_desc, (vop_t *)null_getattr },
+	{ &vop_inactive_desc, (vop_t *)null_inactive },
+	{ &vop_reclaim_desc, (vop_t *)null_reclaim },
+	{ &vop_print_desc, (vop_t *)null_print },
 
-	{ &vop_strategy_desc, null_strategy },
-	{ &vop_bwrite_desc, null_bwrite },
+	{ &vop_strategy_desc, (vop_t *)null_strategy },
+	{ &vop_bwrite_desc, (vop_t *)null_bwrite },
 
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc null_vnodeop_opv_desc =
 	{ &null_vnodeop_p, null_vnodeop_entries };
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index 38d7ee0..f2f1e7b 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.3 1992/05/30 10:05:24 jsp Exp jsp $
+ * $Id: portal.h,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $
  */
 
 struct portal_args {
@@ -67,6 +67,6 @@ struct portalnode {
 
 #define PORTAL_ROOTFILEID	2
 
-extern int (**portal_vnodeop_p)();
+extern vop_t **portal_vnodeop_p;
 extern struct vfsops portal_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 4ee5824..7bea6da 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.6 1995/05/30 08:07:06 rgrimes Exp $
+ * $Id: portal_vnops.c,v 1.7 1995/10/08 00:09:00 swallace Exp $
  */
 
 /*
@@ -659,50 +659,50 @@ portal_nullop()
 #define portal_update ((int (*) __P((struct vop_update_args *)))portal_enotsupp)
 #define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp)
 
-int (**portal_vnodeop_p)();
+vop_t **portal_vnodeop_p;
 struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, portal_lookup },		/* lookup */
-	{ &vop_create_desc, portal_create },		/* create */
-	{ &vop_mknod_desc, portal_mknod },		/* mknod */
-	{ &vop_open_desc, portal_open },		/* open */
-	{ &vop_close_desc, portal_close },		/* close */
-	{ &vop_access_desc, portal_access },		/* access */
-	{ &vop_getattr_desc, portal_getattr },		/* getattr */
-	{ &vop_setattr_desc, portal_setattr },		/* setattr */
-	{ &vop_read_desc, portal_read },		/* read */
-	{ &vop_write_desc, portal_write },		/* write */
-	{ &vop_ioctl_desc, portal_ioctl },		/* ioctl */
-	{ &vop_select_desc, portal_select },		/* select */
-	{ &vop_mmap_desc, portal_mmap },		/* mmap */
-	{ &vop_fsync_desc, portal_fsync },		/* fsync */
-	{ &vop_seek_desc, portal_seek },		/* seek */
-	{ &vop_remove_desc, portal_remove },		/* remove */
-	{ &vop_link_desc, portal_link },		/* link */
-	{ &vop_rename_desc, portal_rename },		/* rename */
-	{ &vop_mkdir_desc, portal_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, portal_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, portal_symlink },		/* symlink */
-	{ &vop_readdir_desc, portal_readdir },		/* readdir */
-	{ &vop_readlink_desc, portal_readlink },	/* readlink */
-	{ &vop_abortop_desc, portal_abortop },		/* abortop */
-	{ &vop_inactive_desc, portal_inactive },	/* inactive */
-	{ &vop_reclaim_desc, portal_reclaim },		/* reclaim */
-	{ &vop_lock_desc, portal_lock },		/* lock */
-	{ &vop_unlock_desc, portal_unlock },		/* unlock */
-	{ &vop_bmap_desc, portal_bmap },		/* bmap */
-	{ &vop_strategy_desc, portal_strategy },	/* strategy */
-	{ &vop_print_desc, portal_print },		/* print */
-	{ &vop_islocked_desc, portal_islocked },	/* islocked */
-	{ &vop_pathconf_desc, portal_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, portal_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, portal_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, portal_valloc },		/* valloc */
-	{ &vop_vfree_desc, portal_vfree },		/* vfree */
-	{ &vop_truncate_desc, portal_truncate },	/* truncate */
-	{ &vop_update_desc, portal_update },		/* update */
-	{ &vop_bwrite_desc, portal_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)portal_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)portal_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)portal_mmap },		/* mmap */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)portal_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)portal_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)portal_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc portal_vnodeop_opv_desc =
 	{ &portal_vnodeop_p, portal_vnodeop_entries };
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index 4632f2b..f21813f 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- *	$Id: procfs.h,v 1.5 1995/05/25 01:35:22 davidg Exp $
+ *	$Id: procfs.h,v 1.6 1995/11/07 13:39:29 phk Exp $
  */
 
 /*
@@ -137,7 +137,7 @@ extern int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pf
 #define PROCFS_LOCKED	0x01
 #define PROCFS_WANT	0x02
 
-extern int (**procfs_vnodeop_p)();
+extern vop_t **procfs_vnodeop_p;
 extern struct vfsops procfs_vfsops;
 
 int	procfs_root __P((struct mount *, struct vnode **));
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index c421569..fa3f0d4 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- *	$Id: procfs_vnops.c,v 1.16 1995/09/02 18:28:48 mpp Exp $
+ *	$Id: procfs_vnops.c,v 1.17 1995/11/07 13:39:31 phk Exp $
  */
 
 /*
@@ -799,49 +799,49 @@ atopid(b, len)
 /*
  * procfs vnode operations.
  */
-int (**procfs_vnodeop_p)();
+vop_t **procfs_vnodeop_p;
 static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, procfs_lookup },		/* lookup */
-	{ &vop_create_desc, procfs_create },		/* create */
-	{ &vop_mknod_desc, procfs_mknod },		/* mknod */
-	{ &vop_open_desc, procfs_open },		/* open */
-	{ &vop_close_desc, procfs_close },		/* close */
-	{ &vop_access_desc, procfs_access },		/* access */
-	{ &vop_getattr_desc, procfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, procfs_setattr },		/* setattr */
-	{ &vop_read_desc, procfs_read },		/* read */
-	{ &vop_write_desc, procfs_write },		/* write */
-	{ &vop_ioctl_desc, procfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, procfs_select },		/* select */
-	{ &vop_mmap_desc, procfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, procfs_fsync },		/* fsync */
-	{ &vop_seek_desc, procfs_seek },		/* seek */
-	{ &vop_remove_desc, procfs_remove },		/* remove */
-	{ &vop_link_desc, procfs_link },		/* link */
-	{ &vop_rename_desc, procfs_rename },		/* rename */
-	{ &vop_mkdir_desc, procfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, procfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, procfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, procfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, procfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, procfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, procfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, procfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, procfs_lock },		/* lock */
-	{ &vop_unlock_desc, procfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, procfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, procfs_strategy },	/* strategy */
-	{ &vop_print_desc, procfs_print },		/* print */
-	{ &vop_islocked_desc, procfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, procfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, procfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, procfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, procfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, procfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, procfs_truncate },	/* truncate */
-	{ &vop_update_desc, procfs_update },		/* update */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)procfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)procfs_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)procfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)procfs_select },		/* select */
+	{ &vop_mmap_desc, (vop_t *)procfs_mmap },		/* mmap */
+	{ &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 */
+	{ &vop_vfree_desc, (vop_t *)procfs_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)procfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)procfs_update },		/* update */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc procfs_vnodeop_opv_desc =
 	{ &procfs_vnodeop_p, procfs_vnodeop_entries };
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index c7430b5..b9ed634 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.15 1995/10/06 09:47:58 phk Exp $
+ * $Id: spec_vnops.c,v 1.16 1995/10/23 02:22:47 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -51,51 +51,51 @@
 #include <miscfs/specfs/specdev.h>
 
 struct vnode *speclisth[SPECHSZ];
-int (**spec_vnodeop_p)();
+vop_t **spec_vnodeop_p;
 struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, spec_close },		/* close */
-	{ &vop_access_desc, spec_access },		/* access */
-	{ &vop_getattr_desc, spec_getattr },		/* getattr */
-	{ &vop_setattr_desc, spec_setattr },		/* setattr */
-	{ &vop_read_desc, spec_read },			/* read */
-	{ &vop_write_desc, spec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, spec_inactive },		/* inactive */
-	{ &vop_reclaim_desc, spec_reclaim },		/* reclaim */
-	{ &vop_lock_desc, spec_lock },			/* lock */
-	{ &vop_unlock_desc, spec_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, spec_print },		/* print */
-	{ &vop_islocked_desc, spec_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },		/* bwrite */
-	{ &vop_getpages_desc, spec_getpages},		/* getpages */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &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_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &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 */
+	{ &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_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc spec_vnodeop_opv_desc =
 	{ &spec_vnodeop_p, spec_vnodeop_entries };
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index 3ef7359..01a799b 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.2 (Berkeley) 2/2/94
- * $Id: specdev.h,v 1.3 1995/07/29 11:40:32 bde Exp $
+ * $Id: specdev.h,v 1.4 1995/10/23 02:22:51 dyson Exp $
  */
 
 /*
@@ -73,7 +73,7 @@ extern	struct vnode *speclisth[SPECHSZ];
 /*
  * Prototypes for special file operations on vnodes.
  */
-extern	int (**spec_vnodeop_p)();
+extern	vop_t **spec_vnodeop_p;
 struct	nameidata;
 struct	componentname;
 struct	ucred;
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 5be2e5e..ad78ccd 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $
+ * $Id: umap.h,v 1.3 1995/05/30 08:07:15 rgrimes Exp $
  */
 
 #define MAPFILEENTRIES 64
@@ -87,6 +87,6 @@ extern struct vnode *umap_checkvp __P((struct vnode *vp, char *fil, int lno));
 #define	UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp)
 #endif
 
-extern int (**umap_vnodeop_p)();
+extern vop_t **umap_vnodeop_p;
 extern struct vfsops umap_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index a82d1c6..1d2d586 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $
+ * $Id: umap_vnops.c,v 1.9 1995/05/30 08:07:22 rgrimes Exp $
  */
 
 /*
@@ -471,20 +471,20 @@ umap_rename(ap)
  * go away with a merged buffer/block cache.
  *
  */
-int (**umap_vnodeop_p)();
+vop_t **umap_vnodeop_p;
 struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
-	{ &vop_default_desc, umap_bypass },
+	{ &vop_default_desc, (vop_t *)umap_bypass },
 
-	{ &vop_getattr_desc, umap_getattr },
-	{ &vop_inactive_desc, umap_inactive },
-	{ &vop_reclaim_desc, umap_reclaim },
-	{ &vop_print_desc, umap_print },
-	{ &vop_rename_desc, umap_rename },
+	{ &vop_getattr_desc, (vop_t *)umap_getattr },
+	{ &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, umap_strategy },
-	{ &vop_bwrite_desc, umap_bwrite },
+	{ &vop_strategy_desc, (vop_t *)umap_strategy },
+	{ &vop_bwrite_desc, (vop_t *)umap_bwrite },
 
-	{ (struct vnodeop_desc*) NULL, (int(*)()) NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc umap_vnodeop_opv_desc =
 	{ &umap_vnodeop_p, umap_vnodeop_entries };
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 05fa481..55c1c87 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
- * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $
+ * $Id: union.h,v 1.3 1995/03/16 18:14:02 bde Exp $
  */
 
 struct union_args {
@@ -116,6 +116,6 @@ extern void union_newupper __P((struct union_node *, struct vnode *));
 #define	UPPERVP(vp) (VTOUNION(vp)->un_uppervp)
 #define OTHERVP(vp) (UPPERVP(vp) ? UPPERVP(vp) : LOWERVP(vp))
 
-extern int (**union_vnodeop_p)();
+extern vop_t **union_vnodeop_p;
 extern struct vfsops union_vfsops;
 #endif /* KERNEL */
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 04db44f..3955414 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.6 (Berkeley) 2/17/94
- * $Id: union_vnops.c,v 1.11 1995/08/17 11:53:51 bde Exp $
+ * $Id: union_vnops.c,v 1.12 1995/09/04 00:20:41 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -1452,52 +1452,52 @@ union_strategy(ap)
 /*
  * Global vfs data structures
  */
-int (**union_vnodeop_p)();
+vop_t **union_vnodeop_p;
 struct vnodeopv_entry_desc union_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, union_lookup },		/* lookup */
-	{ &vop_create_desc, union_create },		/* create */
-	{ &vop_mknod_desc, union_mknod },		/* mknod */
-	{ &vop_open_desc, union_open },			/* open */
-	{ &vop_close_desc, union_close },		/* close */
-	{ &vop_access_desc, union_access },		/* access */
-	{ &vop_getattr_desc, union_getattr },		/* getattr */
-	{ &vop_setattr_desc, union_setattr },		/* setattr */
-	{ &vop_read_desc, union_read },			/* read */
-	{ &vop_write_desc, union_write },		/* write */
-	{ &vop_ioctl_desc, union_ioctl },		/* ioctl */
-	{ &vop_select_desc, union_select },		/* select */
-	{ &vop_mmap_desc, union_mmap },			/* mmap */
-	{ &vop_fsync_desc, union_fsync },		/* fsync */
-	{ &vop_seek_desc, union_seek },			/* seek */
-	{ &vop_remove_desc, union_remove },		/* remove */
-	{ &vop_link_desc, union_link },			/* link */
-	{ &vop_rename_desc, union_rename },		/* rename */
-	{ &vop_mkdir_desc, union_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, union_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, union_symlink },		/* symlink */
-	{ &vop_readdir_desc, union_readdir },		/* readdir */
-	{ &vop_readlink_desc, union_readlink },		/* readlink */
-	{ &vop_abortop_desc, union_abortop },		/* abortop */
-	{ &vop_inactive_desc, union_inactive },		/* inactive */
-	{ &vop_reclaim_desc, union_reclaim },		/* reclaim */
-	{ &vop_lock_desc, union_lock },			/* lock */
-	{ &vop_unlock_desc, union_unlock },		/* unlock */
-	{ &vop_bmap_desc, union_bmap },			/* bmap */
-	{ &vop_strategy_desc, union_strategy },		/* strategy */
-	{ &vop_print_desc, union_print },		/* print */
-	{ &vop_islocked_desc, union_islocked },		/* islocked */
-	{ &vop_pathconf_desc, union_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, union_advlock },		/* advlock */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)union_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)union_create },		/* create */
+	{ &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_ioctl_desc, (vop_t *)union_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)union_select },		/* select */
+	{ &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, union_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, union_valloc },		/* valloc */
-	{ &vop_vfree_desc, union_vfree },		/* vfree */
-	{ &vop_truncate_desc, union_truncate },		/* truncate */
-	{ &vop_update_desc, union_update },		/* update */
-	{ &vop_bwrite_desc, union_bwrite },		/* bwrite */
+	{ &vop_blkatoff_desc, (vop_t *)union_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)union_valloc },		/* valloc */
+	{ &vop_vfree_desc, (vop_t *)union_vfree },		/* vfree */
+	{ &vop_truncate_desc, (vop_t *)union_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)union_update },		/* update */
+	{ &vop_bwrite_desc, (vop_t *)union_bwrite },		/* bwrite */
 #endif
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ NULL, NULL }
 };
 struct vnodeopv_desc union_vnodeop_opv_desc =
 	{ &union_vnodeop_p, union_vnodeop_entries };
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index b9ea01c..7b7dc3a 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.6 1995/08/02 12:59:47 dfr Exp $ */
+/*	$Id: denode.h,v 1.7 1995/10/29 15:31:43 phk Exp $ */
 /*	$NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $	*/
 
 /*-
@@ -226,10 +226,12 @@ struct defid {
 	/* u_long	defid_gen;	 generation number */
 };
 
-extern int (**msdosfs_vnodeop_p)();
+extern vop_t **msdosfs_vnodeop_p;
+
 int msdosfs_lookup __P((struct vop_lookup_args *));
 int msdosfs_inactive __P((struct vop_inactive_args *));
 int msdosfs_reclaim __P((struct vop_reclaim_args *));
+
 /*
  * Internal service routine prototypes.
  */
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index b501a5d..de44543 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.25 1995/10/22 09:32:37 davidg Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.26 1995/10/29 15:31:53 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -2000,46 +2000,46 @@ msdosfs_pathconf(ap)
 }
 
 /* Global vfs data structures for msdosfs */
-int (**msdosfs_vnodeop_p)();
+vop_t **msdosfs_vnodeop_p;
 static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, msdosfs_lookup },		/* lookup */
-	{ &vop_create_desc, msdosfs_create },		/* create */
-	{ &vop_mknod_desc, msdosfs_mknod },		/* mknod */
-	{ &vop_open_desc, msdosfs_open },		/* open */
-	{ &vop_close_desc, msdosfs_close },		/* close */
-	{ &vop_access_desc, msdosfs_access },		/* access */
-	{ &vop_getattr_desc, msdosfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, msdosfs_setattr },		/* setattr */
-	{ &vop_read_desc, msdosfs_read },		/* read */
-	{ &vop_write_desc, msdosfs_write },		/* write */
-	{ &vop_ioctl_desc, msdosfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, msdosfs_select },		/* select */
-	{ &vop_mmap_desc, msdosfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, msdosfs_fsync },		/* fsync */
-	{ &vop_seek_desc, msdosfs_seek },		/* seek */
-	{ &vop_remove_desc, msdosfs_remove },		/* remove */
-	{ &vop_link_desc, msdosfs_link },		/* link */
-	{ &vop_rename_desc, msdosfs_rename },		/* rename */
-	{ &vop_mkdir_desc, msdosfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, msdosfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, msdosfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, msdosfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, msdosfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, msdosfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, msdosfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, msdosfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, msdosfs_lock },		/* lock */
-	{ &vop_unlock_desc, msdosfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, msdosfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, msdosfs_strategy },	/* strategy */
-	{ &vop_print_desc, msdosfs_print },		/* print */
-	{ &vop_islocked_desc, msdosfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, msdosfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, msdosfs_advlock },		/* advlock */
-	{ &vop_reallocblks_desc, msdosfs_reallocblks },	/* reallocblks */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc *)NULL, (int (*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)msdosfs_lookup },		/* lookup */
+	{ &vop_create_desc, (vop_t *)msdosfs_create },		/* create */
+	{ &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 */
+	{ &vop_ioctl_desc, (vop_t *)msdosfs_ioctl },		/* ioctl */
+	{ &vop_select_desc, (vop_t *)msdosfs_select },		/* select */
+	{ &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 */
+	{ &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks },	/* reallocblks */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc msdosfs_vnodeop_opv_desc =
 	{ &msdosfs_vnodeop_p, msdosfs_vnodeop_entries };
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 62a1478..ec818c9 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.27 1995/10/29 15:33:15 phk Exp $
+ * $Id: nfs_vnops.c,v 1.28 1995/11/06 00:36:01 bde Exp $
  */
 
 /*
@@ -136,57 +136,57 @@ static int	nfs_update __P((struct vop_update_args *));
 /*
  * Global vfs data structures for nfs
  */
-int (**nfsv2_vnodeop_p)();
+vop_t **nfsv2_vnodeop_p;
 static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, nfs_lookup },	/* lookup */
-	{ &vop_create_desc, nfs_create },	/* create */
-	{ &vop_mknod_desc, nfs_mknod },		/* mknod */
-	{ &vop_open_desc, nfs_open },		/* open */
-	{ &vop_close_desc, nfs_close },		/* close */
-	{ &vop_access_desc, nfs_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfs_read },		/* read */
-	{ &vop_write_desc, nfs_write },		/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)nfs_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)nfs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)nfs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)nfs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)nfs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)nfs_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, nfs_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)nfs_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, nfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, nfs_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)nfs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)nfs_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, nfs_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)nfs_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, nfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, nfs_seek },		/* seek */
-	{ &vop_remove_desc, nfs_remove },	/* remove */
-	{ &vop_link_desc, nfs_link },		/* link */
-	{ &vop_rename_desc, nfs_rename },	/* rename */
-	{ &vop_mkdir_desc, nfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, nfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, nfs_symlink },	/* symlink */
-	{ &vop_readdir_desc, nfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, nfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, nfs_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, nfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, nfs_strategy },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, nfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, nfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, nfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, nfs_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, nfs_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, nfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, nfs_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, nfs_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)nfs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)nfs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)nfs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)nfs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)nfs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)nfs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)nfs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)nfs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)nfs_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)nfs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)nfs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)nfs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)nfs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)nfs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)nfs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)nfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)nfs_valloc },	/* valloc */
+	{ &vop_reallocblks_desc, (vop_t *)nfs_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)nfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)nfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)nfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc nfsv2_vnodeop_opv_desc =
 	{ &nfsv2_vnodeop_p, nfsv2_vnodeop_entries };
@@ -197,57 +197,57 @@ VNODEOP_SET(nfsv2_vnodeop_opv_desc);
 /*
  * Special device vnode ops
  */
-int (**spec_nfsv2nodeop_p)();
+vop_t **spec_nfsv2nodeop_p;
 static struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },	/* lookup */
-	{ &vop_create_desc, spec_create },	/* create */
-	{ &vop_mknod_desc, spec_mknod },	/* mknod */
-	{ &vop_open_desc, spec_open },		/* open */
-	{ &vop_close_desc, nfsspec_close },	/* close */
-	{ &vop_access_desc, nfsspec_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfsspec_read },	/* read */
-	{ &vop_write_desc, nfsspec_write },	/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)nfsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfsspec_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)nfsspec_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, spec_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, spec_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, spec_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
-	{ &vop_remove_desc, spec_remove },	/* remove */
-	{ &vop_link_desc, spec_link },		/* link */
-	{ &vop_rename_desc, spec_rename },	/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },	/* symlink */
-	{ &vop_readdir_desc, spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, spec_strategy },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_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 *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_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 */
+	{ &vop_reallocblks_desc, (vop_t *)spec_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 	{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
@@ -255,57 +255,57 @@ static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 VNODEOP_SET(spec_nfsv2nodeop_opv_desc);
 #endif
 
-int (**fifo_nfsv2nodeop_p)();
+vop_t **fifo_nfsv2nodeop_p;
 static struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
-	{ &vop_create_desc, fifo_create },	/* create */
-	{ &vop_mknod_desc, fifo_mknod },	/* mknod */
-	{ &vop_open_desc, fifo_open },		/* open */
-	{ &vop_close_desc, nfsfifo_close },	/* close */
-	{ &vop_access_desc, nfsspec_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfsfifo_read },	/* read */
-	{ &vop_write_desc, nfsfifo_write },	/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)nfsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfsspec_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)nfsfifo_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, fifo_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, fifo_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, fifo_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
-	{ &vop_remove_desc, fifo_remove },	/* remove */
-	{ &vop_link_desc, fifo_link },		/* link */
-	{ &vop_rename_desc, fifo_rename },	/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },	/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, fifo_badop },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_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 *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_badop },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_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_reallocblks_desc, (vop_t *)fifo_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
 	{ &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 8de6cdc..02cc1c3 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.12 1995/10/29 15:33:19 phk Exp $
+ * $Id: nfsnode.h,v 1.13 1995/11/06 00:36:03 bde Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -151,9 +151,9 @@ struct nfsnode {
 extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 
 #if defined(KERNEL) || defined(_KERNEL)
-extern	int	(**fifo_nfsv2nodeop_p)();
-extern	int	(**nfsv2_vnodeop_p)();
-extern	int	(**spec_nfsv2nodeop_p)();
+extern	vop_t	**fifo_nfsv2nodeop_p;
+extern	vop_t	**nfsv2_vnodeop_p;
+extern	vop_t	**spec_nfsv2nodeop_p;
 
 /*
  * Prototypes for NFS vnode operations
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 62a1478..ec818c9 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.27 1995/10/29 15:33:15 phk Exp $
+ * $Id: nfs_vnops.c,v 1.28 1995/11/06 00:36:01 bde Exp $
  */
 
 /*
@@ -136,57 +136,57 @@ static int	nfs_update __P((struct vop_update_args *));
 /*
  * Global vfs data structures for nfs
  */
-int (**nfsv2_vnodeop_p)();
+vop_t **nfsv2_vnodeop_p;
 static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, nfs_lookup },	/* lookup */
-	{ &vop_create_desc, nfs_create },	/* create */
-	{ &vop_mknod_desc, nfs_mknod },		/* mknod */
-	{ &vop_open_desc, nfs_open },		/* open */
-	{ &vop_close_desc, nfs_close },		/* close */
-	{ &vop_access_desc, nfs_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfs_read },		/* read */
-	{ &vop_write_desc, nfs_write },		/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)nfs_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)nfs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)nfs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)nfs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)nfs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)nfs_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, nfs_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)nfs_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, nfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, nfs_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)nfs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)nfs_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, nfs_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)nfs_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, nfs_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, nfs_seek },		/* seek */
-	{ &vop_remove_desc, nfs_remove },	/* remove */
-	{ &vop_link_desc, nfs_link },		/* link */
-	{ &vop_rename_desc, nfs_rename },	/* rename */
-	{ &vop_mkdir_desc, nfs_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, nfs_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, nfs_symlink },	/* symlink */
-	{ &vop_readdir_desc, nfs_readdir },	/* readdir */
-	{ &vop_readlink_desc, nfs_readlink },	/* readlink */
-	{ &vop_abortop_desc, nfs_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, nfs_bmap },		/* bmap */
-	{ &vop_strategy_desc, nfs_strategy },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, nfs_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, nfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, nfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, nfs_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, nfs_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, nfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, nfs_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, nfs_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)nfs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)nfs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)nfs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)nfs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)nfs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)nfs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)nfs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)nfs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)nfs_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)nfs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)nfs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)nfs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)nfs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)nfs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)nfs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)nfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)nfs_valloc },	/* valloc */
+	{ &vop_reallocblks_desc, (vop_t *)nfs_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)nfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)nfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)nfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc nfsv2_vnodeop_opv_desc =
 	{ &nfsv2_vnodeop_p, nfsv2_vnodeop_entries };
@@ -197,57 +197,57 @@ VNODEOP_SET(nfsv2_vnodeop_opv_desc);
 /*
  * Special device vnode ops
  */
-int (**spec_nfsv2nodeop_p)();
+vop_t **spec_nfsv2nodeop_p;
 static struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },	/* lookup */
-	{ &vop_create_desc, spec_create },	/* create */
-	{ &vop_mknod_desc, spec_mknod },	/* mknod */
-	{ &vop_open_desc, spec_open },		/* open */
-	{ &vop_close_desc, nfsspec_close },	/* close */
-	{ &vop_access_desc, nfsspec_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfsspec_read },	/* read */
-	{ &vop_write_desc, nfsspec_write },	/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)nfsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfsspec_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)nfsspec_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, spec_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, spec_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, spec_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },		/* seek */
-	{ &vop_remove_desc, spec_remove },	/* remove */
-	{ &vop_link_desc, spec_link },		/* link */
-	{ &vop_rename_desc, spec_rename },	/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },	/* symlink */
-	{ &vop_readdir_desc, spec_readdir },	/* readdir */
-	{ &vop_readlink_desc, spec_readlink },	/* readlink */
-	{ &vop_abortop_desc, spec_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, spec_bmap },		/* bmap */
-	{ &vop_strategy_desc, spec_strategy },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_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 *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_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 */
+	{ &vop_reallocblks_desc, (vop_t *)spec_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 	{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
@@ -255,57 +255,57 @@ static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 VNODEOP_SET(spec_nfsv2nodeop_opv_desc);
 #endif
 
-int (**fifo_nfsv2nodeop_p)();
+vop_t **fifo_nfsv2nodeop_p;
 static struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
-	{ &vop_create_desc, fifo_create },	/* create */
-	{ &vop_mknod_desc, fifo_mknod },	/* mknod */
-	{ &vop_open_desc, fifo_open },		/* open */
-	{ &vop_close_desc, nfsfifo_close },	/* close */
-	{ &vop_access_desc, nfsspec_access },	/* access */
-	{ &vop_getattr_desc, nfs_getattr },	/* getattr */
-	{ &vop_setattr_desc, nfs_setattr },	/* setattr */
-	{ &vop_read_desc, nfsfifo_read },	/* read */
-	{ &vop_write_desc, nfsfifo_write },	/* write */
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)nfsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)nfsspec_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)nfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)nfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)nfsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)nfsfifo_write },	/* write */
 #ifdef HAS_VOPLEASE
-	{ &vop_lease_desc, fifo_lease_check },	/* lease */
+	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 #endif
-	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, fifo_select },	/* select */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
 #ifdef HAS_VOPREVOKE
-	{ &vop_revoke_desc, fifo_revoke },	/* revoke */
+	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 #endif
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
-	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },		/* seek */
-	{ &vop_remove_desc, fifo_remove },	/* remove */
-	{ &vop_link_desc, fifo_link },		/* link */
-	{ &vop_rename_desc, fifo_rename },	/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },	/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },	/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },	/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },	/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },	/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },	/* abortop */
-	{ &vop_inactive_desc, nfs_inactive },	/* inactive */
-	{ &vop_reclaim_desc, nfs_reclaim },	/* reclaim */
-	{ &vop_lock_desc, nfs_lock },		/* lock */
-	{ &vop_unlock_desc, nfs_unlock },	/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },		/* bmap */
-	{ &vop_strategy_desc, fifo_badop },	/* strategy */
-	{ &vop_print_desc, nfs_print },		/* print */
-	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },	/* valloc */
-	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)nfs_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 *)nfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)nfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)nfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)nfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_badop },	/* strategy */
+	{ &vop_print_desc, (vop_t *)nfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)nfs_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_reallocblks_desc, (vop_t *)fifo_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)nfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
 	{ &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 8de6cdc..02cc1c3 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.12 1995/10/29 15:33:19 phk Exp $
+ * $Id: nfsnode.h,v 1.13 1995/11/06 00:36:03 bde Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -151,9 +151,9 @@ struct nfsnode {
 extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
 
 #if defined(KERNEL) || defined(_KERNEL)
-extern	int	(**fifo_nfsv2nodeop_p)();
-extern	int	(**nfsv2_vnodeop_p)();
-extern	int	(**spec_nfsv2nodeop_p)();
+extern	vop_t	**fifo_nfsv2nodeop_p;
+extern	vop_t	**nfsv2_vnodeop_p;
+extern	vop_t	**spec_nfsv2nodeop_p;
 
 /*
  * Prototypes for NFS vnode operations
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index d2accd9..c9e03fc 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.22 1995/07/06 11:48:38 davidg Exp $
+ * $Id: vnode.h,v 1.23 1995/11/08 04:51:15 dyson Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -67,6 +67,8 @@ enum vtagtype	{
  */
 LIST_HEAD(buflists, buf);
 
+typedef	int 	vop_t __P((void *));
+
 struct vnode {
 	u_long	v_flag;				/* vnode flags (see below) */
 	short	v_usecount;			/* reference count of users */
@@ -75,7 +77,7 @@ struct vnode {
 	daddr_t	v_lastr;			/* last read (read-ahead) */
 	u_long	v_id;				/* capability identifier */
 	struct	mount *v_mount;			/* ptr to vfs we are in */
-	int 	(**v_op)();			/* vnode operations vector */
+	vop_t	**v_op;				/* vnode operations vector */
 	TAILQ_ENTRY(vnode) v_freelist;		/* vnode freelist */
 	LIST_ENTRY(vnode) v_mntvnodes;		/* vnodes for mount point */
 	struct	buflists v_cleanblkhd;		/* clean blocklist head */
@@ -332,11 +334,11 @@ extern struct vnodeop_desc *vnodeop_descs[];
  */
 struct vnodeopv_entry_desc {
 	struct vnodeop_desc *opve_op;   /* which operation this is */
-	int (*opve_impl)();		/* code implementing this operation */
+	vop_t *opve_impl;		/* code implementing this operation */
 };
 struct vnodeopv_desc {
 			/* ptr to the ptr to the vector where op should go */
-	int (***opv_desc_vector_p)();
+	vop_t ***opv_desc_vector_p;
 	struct vnodeopv_entry_desc *opv_desc_ops;   /* null terminated list */
 };
 
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index b190fa6..9a4bbfd 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id: ffs_extern.h,v 1.6 1995/03/28 07:57:46 bde Exp $
+ * $Id: ffs_extern.h,v 1.7 1995/09/06 05:41:16 dyson Exp $
  */
 
 struct buf;
@@ -92,7 +92,7 @@ void	ffs_checkoverlap __P((struct buf *, struct inode *));
 #endif
 __END_DECLS
 
-extern int (**ffs_vnodeop_p)();
-extern int (**ffs_specop_p)();
-extern int (**ffs_fifoop_p)();
+extern vop_t **ffs_vnodeop_p;
+extern vop_t **ffs_specop_p;
+extern vop_t **ffs_fifoop_p;
 #define FFS_FIFOOPS ffs_fifoop_p
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 2f49da7..30d5396 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.7 (Berkeley) 2/3/94
- * $Id: ffs_vnops.c,v 1.15 1995/09/25 06:00:59 dyson Exp $
+ * $Id: ffs_vnops.c,v 1.16 1995/10/23 02:23:07 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -65,151 +65,151 @@
 #include <ufs/ffs/ffs_extern.h>
 
 /* Global vfs data structures for ufs. */
-int (**ffs_vnodeop_p)();
+vop_t **ffs_vnodeop_p;
 struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, ufs_lookup },		/* lookup */
-	{ &vop_create_desc, ufs_create },		/* create */
-	{ &vop_mknod_desc, ufs_mknod },			/* mknod */
-	{ &vop_open_desc, ufs_open },			/* open */
-	{ &vop_close_desc, ufs_close },			/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ffs_read },			/* read */
-	{ &vop_write_desc, ffs_write },			/* write */
-	{ &vop_ioctl_desc, ufs_ioctl },			/* ioctl */
-	{ &vop_select_desc, ufs_select },		/* select */
-	{ &vop_mmap_desc, ufs_mmap },			/* mmap */
-	{ &vop_fsync_desc, ffs_fsync },			/* fsync */
-	{ &vop_seek_desc, ufs_seek },			/* seek */
-	{ &vop_remove_desc, ufs_remove },		/* remove */
-	{ &vop_link_desc, ufs_link },			/* link */
-	{ &vop_rename_desc, ufs_rename },		/* rename */
-	{ &vop_mkdir_desc, ufs_mkdir },			/* mkdir */
-	{ &vop_rmdir_desc, ufs_rmdir },			/* rmdir */
-	{ &vop_symlink_desc, ufs_symlink },		/* symlink */
-	{ &vop_readdir_desc, ufs_readdir },		/* readdir */
-	{ &vop_readlink_desc, ufs_readlink },		/* readlink */
-	{ &vop_abortop_desc, ufs_abortop },		/* abortop */
-	{ &vop_inactive_desc, ufs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, ufs_bmap },			/* bmap */
-	{ &vop_strategy_desc, ufs_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, ufs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, ufs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, ffs_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, ffs_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, ffs_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ffs_vfree },			/* vfree */
-	{ &vop_truncate_desc, ffs_truncate },		/* truncate */
-	{ &vop_update_desc, ffs_update },		/* update */
-	{ &vop_getpages_desc, ffs_getpages},
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)ufs_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)ufs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ffs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)ffs_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ffs_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)ufs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)ufs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)ufs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)ufs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)ufs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)ufs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)ufs_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)ufs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)ufs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)ufs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)ufs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)ufs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)ufs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)ufs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)ffs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)ffs_valloc },	/* valloc */
+	{ &vop_reallocblks_desc, (vop_t *)ffs_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ffs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)ffs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
+	{ &vop_getpages_desc, (vop_t *)ffs_getpages},	/* getpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ffs_vnodeop_opv_desc =
 	{ &ffs_vnodeop_p, ffs_vnodeop_entries };
 
-int (**ffs_specop_p)();
+vop_t **ffs_specop_p;
 struct vnodeopv_entry_desc ffs_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, ufsspec_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsspec_read },		/* read */
-	{ &vop_write_desc, ufsspec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, ffs_fsync },			/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, ufs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ffs_vfree },			/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, ffs_update },		/* update */
-	{ &vop_getpages_desc, spec_getpages},
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ffs_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 *)ufs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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 */
+	{ &vop_reallocblks_desc, (vop_t *)spec_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ffs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
+	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ffs_specop_opv_desc =
 	{ &ffs_specop_p, ffs_specop_entries };
 
-int (**ffs_fifoop_p)();
+vop_t **ffs_fifoop_p;
 struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, ufsfifo_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, ufs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsfifo_read },		/* read */
-	{ &vop_write_desc, ufsfifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, ffs_fsync },			/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, ufs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, ffs_vfree },			/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, ffs_update },		/* update */
-	{ &vop_bwrite_desc, vn_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)ufsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)ufs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)ffs_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 *)ufs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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_reallocblks_desc, (vop_t *)fifo_reallocblks },	/* reallocblks */
+	{ &vop_vfree_desc, (vop_t *)ffs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc ffs_fifoop_opv_desc =
 	{ &ffs_fifoop_p, ffs_fifoop_entries };
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 927c15b..bacb2e9 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.6 1995/07/29 11:43:06 bde Exp $
+ * $Id: lfs_extern.h,v 1.7 1995/08/16 16:14:10 bde Exp $
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
@@ -109,9 +109,9 @@ __END_DECLS
 
 extern int lfs_allclean_wakeup;
 extern int locked_queue_count;
-extern int (**lfs_vnodeop_p)();
-extern int (**lfs_specop_p)();
-extern int (**lfs_fifoop_p)();
+extern vop_t **lfs_vnodeop_p;
+extern vop_t **lfs_specop_p;
+extern vop_t **lfs_fifoop_p;
 #define LFS_FIFOOPS lfs_fifoop_p
 
 #endif
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index ccf4908..fc591d4 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.13 1995/08/01 18:51:01 davidg Exp $
+ * $Id: lfs_vnops.c,v 1.14 1995/08/06 11:59:48 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -66,146 +66,146 @@
 #include <ufs/lfs/lfs_extern.h>
 
 /* Global vfs data structures for lfs. */
-int (**lfs_vnodeop_p)();
+vop_t **lfs_vnodeop_p;
 struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, ufs_lookup },		/* lookup */
-	{ &vop_create_desc, ufs_create },		/* create */
-	{ &vop_mknod_desc, ufs_mknod },			/* mknod */
-	{ &vop_open_desc, ufs_open },			/* open */
-	{ &vop_close_desc, lfs_close },			/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, lfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, lfs_read },			/* read */
-	{ &vop_write_desc, lfs_write },			/* write */
-	{ &vop_ioctl_desc, ufs_ioctl },			/* ioctl */
-	{ &vop_select_desc, ufs_select },		/* select */
-	{ &vop_mmap_desc, ufs_mmap },			/* mmap */
-	{ &vop_fsync_desc, lfs_fsync },			/* fsync */
-	{ &vop_seek_desc, ufs_seek },			/* seek */
-	{ &vop_remove_desc, ufs_remove },		/* remove */
-	{ &vop_link_desc, ufs_link },			/* link */
-	{ &vop_rename_desc, ufs_rename },		/* rename */
-	{ &vop_mkdir_desc, ufs_mkdir },			/* mkdir */
-	{ &vop_rmdir_desc, ufs_rmdir },			/* rmdir */
-	{ &vop_symlink_desc, ufs_symlink },		/* symlink */
-	{ &vop_readdir_desc, ufs_readdir },		/* readdir */
-	{ &vop_readlink_desc, ufs_readlink },		/* readlink */
-	{ &vop_abortop_desc, ufs_abortop },		/* abortop */
-	{ &vop_inactive_desc, lfs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, ufs_bmap },			/* bmap */
-	{ &vop_strategy_desc, ufs_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, ufs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, ufs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, lfs_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, lfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, lfs_vfree },			/* vfree */
-	{ &vop_truncate_desc, lfs_truncate },		/* truncate */
-	{ &vop_update_desc, lfs_update },		/* update */
-	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)ufs_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)ufs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)lfs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)lfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)lfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)lfs_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)lfs_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)ufs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)ufs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)ufs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)ufs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)ufs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)ufs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)ufs_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)ufs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)ufs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)lfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)ufs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)ufs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)ufs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)ufs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)lfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)lfs_valloc },	/* valloc */
+	{ &vop_vfree_desc, (vop_t *)lfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)lfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc lfs_vnodeop_opv_desc =
 	{ &lfs_vnodeop_p, lfs_vnodeop_entries };
 
-int (**lfs_specop_p)();
+vop_t **lfs_specop_p;
 struct vnodeopv_entry_desc lfs_specop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, spec_lookup },		/* lookup */
-	{ &vop_create_desc, spec_create },		/* create */
-	{ &vop_mknod_desc, spec_mknod },		/* mknod */
-	{ &vop_open_desc, spec_open },			/* open */
-	{ &vop_close_desc, ufsspec_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, lfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsspec_read },		/* read */
-	{ &vop_write_desc, ufsspec_write },		/* write */
-	{ &vop_ioctl_desc, spec_ioctl },		/* ioctl */
-	{ &vop_select_desc, spec_select },		/* select */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
-	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
-	{ &vop_remove_desc, spec_remove },		/* remove */
-	{ &vop_link_desc, spec_link },			/* link */
-	{ &vop_rename_desc, spec_rename },		/* rename */
-	{ &vop_mkdir_desc, spec_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, spec_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, spec_symlink },		/* symlink */
-	{ &vop_readdir_desc, spec_readdir },		/* readdir */
-	{ &vop_readlink_desc, spec_readlink },		/* readlink */
-	{ &vop_abortop_desc, spec_abortop },		/* abortop */
-	{ &vop_inactive_desc, lfs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, spec_bmap },			/* bmap */
-	{ &vop_strategy_desc, spec_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, lfs_vfree },			/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, lfs_update },		/* update */
-	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
+	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)lfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &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 *)lfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)spec_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)spec_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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 */
+	{ &vop_vfree_desc, (vop_t *)lfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc lfs_specop_opv_desc =
 	{ &lfs_specop_p, lfs_specop_entries };
 
-int (**lfs_fifoop_p)();
+vop_t **lfs_fifoop_p;
 struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
-	{ &vop_create_desc, fifo_create },		/* create */
-	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
-	{ &vop_open_desc, fifo_open },			/* open */
-	{ &vop_close_desc, ufsfifo_close },		/* close */
-	{ &vop_access_desc, ufs_access },		/* access */
-	{ &vop_getattr_desc, lfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, ufs_setattr },		/* setattr */
-	{ &vop_read_desc, ufsfifo_read },		/* read */
-	{ &vop_write_desc, ufsfifo_write },		/* write */
-	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
-	{ &vop_select_desc, fifo_select },		/* select */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
-	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
-	{ &vop_remove_desc, fifo_remove },		/* remove */
-	{ &vop_link_desc, fifo_link },			/* link */
-	{ &vop_rename_desc, fifo_rename },		/* rename */
-	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
-	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
-	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
-	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
-	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
-	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
-	{ &vop_inactive_desc, lfs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, ufs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, ufs_lock },			/* lock */
-	{ &vop_unlock_desc, ufs_unlock },		/* unlock */
-	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
-	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
-	{ &vop_print_desc, ufs_print },			/* print */
-	{ &vop_islocked_desc, ufs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_vfree_desc, lfs_vfree },			/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, lfs_update },		/* update */
-	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+	{ &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 *)ufsfifo_close },	/* close */
+	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)lfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)ufs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
+	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &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 *)lfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)ufs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)ufs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)ufs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)fifo_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)fifo_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)ufs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)ufs_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 *)lfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc lfs_fifoop_opv_desc =
 	{ &lfs_fifoop_p, lfs_fifoop_entries };
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index b6316b6..dcc0358 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.4 (Berkeley) 4/16/94
- * $Id: mfs_vfsops.c,v 1.12 1995/08/28 09:19:14 julian Exp $
+ * $Id: mfs_vfsops.c,v 1.13 1995/08/30 01:34:28 bde Exp $
  */
 
 #include <sys/param.h>
@@ -67,7 +67,7 @@ u_long	mfs_rootsize;	/* size of mini-root in bytes */
 
 static	int mfs_minor;	/* used for building internal dev_t */
 
-extern int (**mfs_vnodeop_p)();
+extern vop_t **mfs_vnodeop_p;
 
 /*
  * mfs vfs operations.
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index a706419..f780d2f 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.3 (Berkeley) 9/21/93
- * $Id: mfs_vnops.c,v 1.10 1995/05/11 19:26:53 rgrimes Exp $
+ * $Id: mfs_vnops.c,v 1.11 1995/10/31 10:45:48 peter Exp $
  */
 
 #include <sys/param.h>
@@ -60,50 +60,50 @@ extern char mfsiobuf[];
 /*
  * mfs vnode operations.
  */
-int (**mfs_vnodeop_p)();
+vop_t **mfs_vnodeop_p;
 struct vnodeopv_entry_desc mfs_vnodeop_entries[] = {
-	{ &vop_default_desc, vn_default_error },
-	{ &vop_lookup_desc, mfs_lookup },		/* lookup */
-	{ &vop_create_desc, mfs_create },		/* create */
-	{ &vop_mknod_desc, mfs_mknod },			/* mknod */
-	{ &vop_open_desc, mfs_open },			/* open */
-	{ &vop_close_desc, mfs_close },			/* close */
-	{ &vop_access_desc, mfs_access },		/* access */
-	{ &vop_getattr_desc, mfs_getattr },		/* getattr */
-	{ &vop_setattr_desc, mfs_setattr },		/* setattr */
-	{ &vop_read_desc, mfs_read },			/* read */
-	{ &vop_write_desc, mfs_write },			/* write */
-	{ &vop_ioctl_desc, mfs_ioctl },			/* ioctl */
-	{ &vop_select_desc, mfs_select },		/* select */
-	{ &vop_mmap_desc, mfs_mmap },			/* mmap */
-	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, mfs_seek },			/* seek */
-	{ &vop_remove_desc, mfs_remove },		/* remove */
-	{ &vop_link_desc, mfs_link },			/* link */
-	{ &vop_rename_desc, mfs_rename },		/* rename */
-	{ &vop_mkdir_desc, mfs_mkdir },			/* mkdir */
-	{ &vop_rmdir_desc, mfs_rmdir },			/* rmdir */
-	{ &vop_symlink_desc, mfs_symlink },		/* symlink */
-	{ &vop_readdir_desc, mfs_readdir },		/* readdir */
-	{ &vop_readlink_desc, mfs_readlink },		/* readlink */
-	{ &vop_abortop_desc, mfs_abortop },		/* abortop */
-	{ &vop_inactive_desc, mfs_inactive },		/* inactive */
-	{ &vop_reclaim_desc, mfs_reclaim },		/* reclaim */
-	{ &vop_lock_desc, mfs_lock },			/* lock */
-	{ &vop_unlock_desc, mfs_unlock },		/* unlock */
-	{ &vop_bmap_desc, mfs_bmap },			/* bmap */
-	{ &vop_strategy_desc, mfs_strategy },		/* strategy */
-	{ &vop_print_desc, mfs_print },			/* print */
-	{ &vop_islocked_desc, mfs_islocked },		/* islocked */
-	{ &vop_pathconf_desc, mfs_pathconf },		/* pathconf */
-	{ &vop_advlock_desc, mfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, mfs_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, mfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, mfs_vfree },			/* vfree */
-	{ &vop_truncate_desc, mfs_truncate },		/* truncate */
-	{ &vop_update_desc, mfs_update },		/* update */
-	{ &vop_bwrite_desc, mfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
+	{ &vop_default_desc, (vop_t *)vn_default_error },
+	{ &vop_lookup_desc, (vop_t *)mfs_lookup },	/* lookup */
+	{ &vop_create_desc, (vop_t *)mfs_create },	/* create */
+	{ &vop_mknod_desc, (vop_t *)mfs_mknod },	/* mknod */
+	{ &vop_open_desc, (vop_t *)mfs_open },		/* open */
+	{ &vop_close_desc, (vop_t *)mfs_close },	/* close */
+	{ &vop_access_desc, (vop_t *)mfs_access },	/* access */
+	{ &vop_getattr_desc, (vop_t *)mfs_getattr },	/* getattr */
+	{ &vop_setattr_desc, (vop_t *)mfs_setattr },	/* setattr */
+	{ &vop_read_desc, (vop_t *)mfs_read },		/* read */
+	{ &vop_write_desc, (vop_t *)mfs_write },	/* write */
+	{ &vop_ioctl_desc, (vop_t *)mfs_ioctl },	/* ioctl */
+	{ &vop_select_desc, (vop_t *)mfs_select },	/* select */
+	{ &vop_mmap_desc, (vop_t *)mfs_mmap },		/* mmap */
+	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
+	{ &vop_seek_desc, (vop_t *)mfs_seek },		/* seek */
+	{ &vop_remove_desc, (vop_t *)mfs_remove },	/* remove */
+	{ &vop_link_desc, (vop_t *)mfs_link },		/* link */
+	{ &vop_rename_desc, (vop_t *)mfs_rename },	/* rename */
+	{ &vop_mkdir_desc, (vop_t *)mfs_mkdir },	/* mkdir */
+	{ &vop_rmdir_desc, (vop_t *)mfs_rmdir },	/* rmdir */
+	{ &vop_symlink_desc, (vop_t *)mfs_symlink },	/* symlink */
+	{ &vop_readdir_desc, (vop_t *)mfs_readdir },	/* readdir */
+	{ &vop_readlink_desc, (vop_t *)mfs_readlink },	/* readlink */
+	{ &vop_abortop_desc, (vop_t *)mfs_abortop },	/* abortop */
+	{ &vop_inactive_desc, (vop_t *)mfs_inactive },	/* inactive */
+	{ &vop_reclaim_desc, (vop_t *)mfs_reclaim },	/* reclaim */
+	{ &vop_lock_desc, (vop_t *)mfs_lock },		/* lock */
+	{ &vop_unlock_desc, (vop_t *)mfs_unlock },	/* unlock */
+	{ &vop_bmap_desc, (vop_t *)mfs_bmap },		/* bmap */
+	{ &vop_strategy_desc, (vop_t *)mfs_strategy },	/* strategy */
+	{ &vop_print_desc, (vop_t *)mfs_print },	/* print */
+	{ &vop_islocked_desc, (vop_t *)mfs_islocked },	/* islocked */
+	{ &vop_pathconf_desc, (vop_t *)mfs_pathconf },	/* pathconf */
+	{ &vop_advlock_desc, (vop_t *)mfs_advlock },	/* advlock */
+	{ &vop_blkatoff_desc, (vop_t *)mfs_blkatoff },	/* blkatoff */
+	{ &vop_valloc_desc, (vop_t *)mfs_valloc },	/* valloc */
+	{ &vop_vfree_desc, (vop_t *)mfs_vfree },	/* vfree */
+	{ &vop_truncate_desc, (vop_t *)mfs_truncate },	/* truncate */
+	{ &vop_update_desc, (vop_t *)mfs_update },	/* update */
+	{ &vop_bwrite_desc, (vop_t *)mfs_bwrite },	/* bwrite */
+	{ NULL, NULL }
 };
 struct vnodeopv_desc mfs_vnodeop_opv_desc =
 	{ &mfs_vnodeop_p, mfs_vnodeop_entries };
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e229d68..d286b55 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.10 (Berkeley) 4/1/94
- * $Id: ufs_vnops.c,v 1.31 1995/10/22 09:32:48 davidg Exp $
+ * $Id: ufs_vnops.c,v 1.32 1995/11/05 23:35:58 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -2010,8 +2010,8 @@ ufs_advlock(ap)
 int
 ufs_vinit(mntp, specops, fifoops, vpp)
 	struct mount *mntp;
-	int (**specops)();
-	int (**fifoops)();
+	vop_t **specops;
+	vop_t **fifoops;
 	struct vnode **vpp;
 {
 	struct inode *ip;