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.

7 files changed, 322 insertions, 322 deletions

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;