vnops megacommit

1.  Use the default function to access all the specfs operations.
2.  Use the default function to access all the fifofs operations.
3.  Use the default function to access all the ufs operations.
4.  Fix VCALL usage in vfs_cache.c
5.  Use VOCALL to access specfs functions in devfs_vnops.c
6.  Staticize most of the spec and fifofs vnops functions.
7.  Make UFS panic if it lacks bits of the underlying storage handling.

1 files changed, 6 insertions, 112 deletions

diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 8a4d836..b7d930f 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.13 (Berkeley) 6/10/95
- * $Id: lfs_vnops.c,v 1.25 1997/10/15 09:21:59 phk Exp $
+ * $Id: lfs_vnops.c,v 1.26 1997/10/15 10:05:23 phk Exp $
  */
 
 #include <sys/param.h>
@@ -72,50 +72,20 @@ static int	 lfs_write __P((struct vop_write_args *));
 /* Global vfs data structures for lfs. */
 vop_t **lfs_vnodeop_p;
 static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) ufs_abortop },
-	{ &vop_access_desc,		(vop_t *) ufs_access },
-	{ &vop_advlock_desc,		(vop_t *) ufs_advlock },
+	{ &vop_default_desc,		(vop_t *) ufs_vnoperate },
+
 	{ &vop_blkatoff_desc,		(vop_t *) lfs_blkatoff },
-	{ &vop_bmap_desc,		(vop_t *) ufs_bmap },
 	{ &vop_bwrite_desc,		(vop_t *) lfs_bwrite },
 	{ &vop_close_desc,		(vop_t *) lfs_close },
-	{ &vop_create_desc,		(vop_t *) ufs_create },
 	{ &vop_fsync_desc,		(vop_t *) lfs_fsync },
 	{ &vop_getattr_desc,		(vop_t *) lfs_getattr },
-	{ &vop_inactive_desc,		(vop_t *) ufs_inactive },
-	{ &vop_ioctl_desc,		(vop_t *) ufs_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) ufs_islocked },
-	{ &vop_lease_desc,		(vop_t *) ufs_lease_check },
-	{ &vop_link_desc,		(vop_t *) ufs_link },
-	{ &vop_lock_desc,		(vop_t *) ufs_lock },
-	{ &vop_lookup_desc,		(vop_t *) ufs_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) ufs_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) ufs_mknod },
-	{ &vop_mmap_desc,		(vop_t *) ufs_mmap },
-	{ &vop_open_desc,		(vop_t *) ufs_open },
-	{ &vop_pathconf_desc,		(vop_t *) ufs_pathconf },
-	{ &vop_poll_desc,		(vop_t *) ufs_poll },
-	{ &vop_print_desc,		(vop_t *) ufs_print },
 	{ &vop_read_desc,		(vop_t *) lfs_read },
-	{ &vop_readdir_desc,		(vop_t *) ufs_readdir },
-	{ &vop_readlink_desc,		(vop_t *) ufs_readlink },
-	{ &vop_reclaim_desc,		(vop_t *) ufs_reclaim },
-	{ &vop_remove_desc,		(vop_t *) ufs_remove },
-	{ &vop_rename_desc,		(vop_t *) ufs_rename },
-	{ &vop_revoke_desc,		(vop_t *) ufs_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) ufs_rmdir },
-	{ &vop_seek_desc,		(vop_t *) ufs_seek },
-	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
-	{ &vop_strategy_desc,		(vop_t *) ufs_strategy },
-	{ &vop_symlink_desc,		(vop_t *) ufs_symlink },
 	{ &vop_truncate_desc,		(vop_t *) lfs_truncate },
-	{ &vop_unlock_desc,		(vop_t *) ufs_unlock },
 	{ &vop_update_desc,		(vop_t *) lfs_update },
 	{ &vop_valloc_desc,		(vop_t *) lfs_valloc },
 	{ &vop_vfree_desc,		(vop_t *) lfs_vfree },
-	{ &vop_whiteout_desc,		(vop_t *) ufs_whiteout },
 	{ &vop_write_desc,		(vop_t *) lfs_write },
+	{ &vop_lookup_desc,		(vop_t *) ufs_lookup },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc lfs_vnodeop_opv_desc =
@@ -123,49 +93,11 @@ static struct vnodeopv_desc lfs_vnodeop_opv_desc =
 
 vop_t **lfs_specop_p;
 static struct vnodeopv_entry_desc lfs_specop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) spec_abortop },
-	{ &vop_access_desc,		(vop_t *) ufs_access },
-	{ &vop_advlock_desc,		(vop_t *) spec_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) spec_blkatoff },
-	{ &vop_bmap_desc,		(vop_t *) spec_bmap },
+	{ &vop_default_desc,		(vop_t *) ufs_vnoperatespec },
 	{ &vop_bwrite_desc,		(vop_t *) lfs_bwrite },
-	{ &vop_close_desc,		(vop_t *) ufsspec_close },
-	{ &vop_create_desc,		(vop_t *) spec_create },
-	{ &vop_fsync_desc,		(vop_t *) spec_fsync },
 	{ &vop_getattr_desc,		(vop_t *) lfs_getattr },
-	{ &vop_inactive_desc,		(vop_t *) ufs_inactive },
-	{ &vop_ioctl_desc,		(vop_t *) spec_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) ufs_islocked },
-	{ &vop_lease_desc,		(vop_t *) spec_lease_check },
-	{ &vop_link_desc,		(vop_t *) spec_link },
-	{ &vop_lock_desc,		(vop_t *) ufs_lock },
-	{ &vop_lookup_desc,		(vop_t *) spec_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) spec_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) spec_mknod },
-	{ &vop_mmap_desc,		(vop_t *) spec_mmap },
-	{ &vop_open_desc,		(vop_t *) spec_open },
-	{ &vop_pathconf_desc,		(vop_t *) spec_pathconf },
-	{ &vop_poll_desc,		(vop_t *) spec_poll },
-	{ &vop_print_desc,		(vop_t *) ufs_print },
-	{ &vop_read_desc,		(vop_t *) ufsspec_read },
-	{ &vop_readdir_desc,		(vop_t *) spec_readdir },
-	{ &vop_readlink_desc,		(vop_t *) spec_readlink },
-	{ &vop_reclaim_desc,		(vop_t *) ufs_reclaim },
-	{ &vop_remove_desc,		(vop_t *) spec_remove },
-	{ &vop_rename_desc,		(vop_t *) spec_rename },
-	{ &vop_revoke_desc,		(vop_t *) spec_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) spec_rmdir },
-	{ &vop_seek_desc,		(vop_t *) spec_seek },
-	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
-	{ &vop_strategy_desc,		(vop_t *) spec_strategy },
-	{ &vop_symlink_desc,		(vop_t *) spec_symlink },
-	{ &vop_truncate_desc,		(vop_t *) spec_truncate },
-	{ &vop_unlock_desc,		(vop_t *) ufs_unlock },
 	{ &vop_update_desc,		(vop_t *) lfs_update },
-	{ &vop_valloc_desc,		(vop_t *) spec_valloc },
 	{ &vop_vfree_desc,		(vop_t *) lfs_vfree },
-	{ &vop_write_desc,		(vop_t *) ufsspec_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc lfs_specop_opv_desc =
@@ -173,49 +105,11 @@ static struct vnodeopv_desc lfs_specop_opv_desc =
 
 vop_t **lfs_fifoop_p;
 static struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) vn_default_error },
-	{ &vop_abortop_desc,		(vop_t *) fifo_abortop },
-	{ &vop_access_desc,		(vop_t *) ufs_access },
-	{ &vop_advlock_desc,		(vop_t *) fifo_advlock },
-	{ &vop_blkatoff_desc,		(vop_t *) fifo_blkatoff },
-	{ &vop_bmap_desc,		(vop_t *) fifo_bmap },
+	{ &vop_default_desc,		(vop_t *) ufs_vnoperatefifo },
 	{ &vop_bwrite_desc,		(vop_t *) lfs_bwrite },
-	{ &vop_close_desc,		(vop_t *) ufsfifo_close },
-	{ &vop_create_desc,		(vop_t *) fifo_create },
-	{ &vop_fsync_desc,		(vop_t *) fifo_fsync },
 	{ &vop_getattr_desc,		(vop_t *) lfs_getattr },
-	{ &vop_inactive_desc,		(vop_t *) ufs_inactive },
-	{ &vop_ioctl_desc,		(vop_t *) fifo_ioctl },
-	{ &vop_islocked_desc,		(vop_t *) ufs_islocked },
-	{ &vop_lease_desc,		(vop_t *) fifo_lease_check },
-	{ &vop_link_desc,		(vop_t *) fifo_link },
-	{ &vop_lock_desc,		(vop_t *) ufs_lock },
-	{ &vop_lookup_desc,		(vop_t *) fifo_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) fifo_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) fifo_mknod },
-	{ &vop_mmap_desc,		(vop_t *) fifo_mmap },
-	{ &vop_open_desc,		(vop_t *) fifo_open },
-	{ &vop_pathconf_desc,		(vop_t *) fifo_pathconf },
-	{ &vop_poll_desc,		(vop_t *) fifo_poll },
-	{ &vop_print_desc,		(vop_t *) ufs_print },
-	{ &vop_read_desc,		(vop_t *) ufsfifo_read },
-	{ &vop_readdir_desc,		(vop_t *) fifo_readdir },
-	{ &vop_readlink_desc,		(vop_t *) fifo_readlink },
-	{ &vop_reclaim_desc,		(vop_t *) ufs_reclaim },
-	{ &vop_remove_desc,		(vop_t *) fifo_remove },
-	{ &vop_rename_desc,		(vop_t *) fifo_rename },
-	{ &vop_revoke_desc,		(vop_t *) fifo_revoke },
-	{ &vop_rmdir_desc,		(vop_t *) fifo_rmdir },
-	{ &vop_seek_desc,		(vop_t *) fifo_seek },
-	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
-	{ &vop_strategy_desc,		(vop_t *) fifo_strategy },
-	{ &vop_symlink_desc,		(vop_t *) fifo_symlink },
-	{ &vop_truncate_desc,		(vop_t *) fifo_truncate },
-	{ &vop_unlock_desc,		(vop_t *) ufs_unlock },
 	{ &vop_update_desc,		(vop_t *) lfs_update },
-	{ &vop_valloc_desc,		(vop_t *) fifo_valloc },
 	{ &vop_vfree_desc,		(vop_t *) lfs_vfree },
-	{ &vop_write_desc,		(vop_t *) ufsfifo_write },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc lfs_fifoop_opv_desc =