Back when VOP_* was introduced, we did not have new-style struct

initializations but we did have lofty goals and big ideals.

Adjust to more contemporary circumstances and gain type checking.

	Replace the entire vop_t frobbing thing with properly typed
	structures.  The only casualty is that we can not add a new
	VOP_ method with a loadable module.  History has not given
	us reason to belive this would ever be feasible in the the
	first place.

	Eliminate in toto VOCALL(), vop_t, VNODEOP_SET() etc.

	Give coda correct prototypes and function definitions for
	all vop_()s.

	Generate a bit more data from the vnode_if.src file:  a
	struct vop_vector and protype typedefs for all vop methods.

	Add a new vop_bypass() and make vop_default be a pointer
	to another struct vop_vector.

	Remove a lot of vfs_init since vop_vector is ready to use
	from the compiler.

	Cast various vop_mumble() to void * with uppercase name,
	for instance VOP_PANIC, VOP_NULL etc.

	Implement VCALL() by making vdesc_offset the offsetof() the
	relevant function pointer in vop_vector.  This is disgusting
	but since the code is generated by a script comparatively
	safe.  The alternative for nullfs etc. would be much worse.

	Fix up all vnode method vectors to remove casts so they
	become typesafe.  (The bulk of this is generated by scripts)

5 files changed, 107 insertions, 147 deletions

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index a56d6de..6de7a82 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -89,8 +89,8 @@ int	ffs_vfree(struct vnode *, ino_t, int);
 vfs_vget_t ffs_vget;
 vfs_vptofh_t ffs_vptofh;
 
-extern vop_t **ffs_vnodeop_p;
-extern vop_t **ffs_fifoop_p;
+extern struct vop_vector ffs_vnodeops;
+extern struct vop_vector ffs_fifoops;
 
 /*
  * Soft update function prototypes.
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index fc97618..4252344 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1242,7 +1242,7 @@ ffs_vget(mp, ino, flags, vpp)
 	ip = uma_zalloc(uma_inode, M_WAITOK);
 
 	/* Allocate a new vnode/inode. */
-	error = getnewvnode("ufs", mp, ffs_vnodeop_p, &vp);
+	error = getnewvnode("ufs", mp, &ffs_vnodeops, &vp);
 	if (error) {
 		*vpp = NULL;
 		uma_zfree(uma_inode, ip);
@@ -1322,7 +1322,7 @@ ffs_vget(mp, ino, flags, vpp)
 	 * Initialize the vnode from the inode, check for aliases.
 	 * Note that the underlying vnode may have changed.
 	 */
-	error = ufs_vinit(mp, ffs_fifoop_p, &vp);
+	error = ufs_vinit(mp, &ffs_fifoops, &vp);
 	if (error) {
 		vput(vp);
 		*vpp = NULL;
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index f2722a2..1b90129 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -118,44 +118,33 @@ static vop_setextattr_t	ffs_setextattr;
 
 
 /* Global vfs data structures for ufs. */
-vop_t **ffs_vnodeop_p;
-static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) ufs_vnoperate },
-	{ &vop_fsync_desc,		(vop_t *) ffs_fsync },
-	{ &vop_getpages_desc,		(vop_t *) ffs_getpages },
-	{ &vop_read_desc,		(vop_t *) ffs_read },
-	{ &vop_reallocblks_desc,	(vop_t *) ffs_reallocblks },
-	{ &vop_write_desc,		(vop_t *) ffs_write },
-	{ &vop_closeextattr_desc,	(vop_t *) ffs_closeextattr },
-	{ &vop_deleteextattr_desc,	(vop_t *) ffs_deleteextattr },
-	{ &vop_getextattr_desc,		(vop_t *) ffs_getextattr },
-	{ &vop_listextattr_desc,	(vop_t *) ffs_listextattr },
-	{ &vop_openextattr_desc,	(vop_t *) ffs_openextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ffs_setextattr },
-	{ NULL, NULL }
+struct vop_vector ffs_vnodeops = {
+	.vop_default =		&ufs_vnodeops,
+	.vop_fsync =		ffs_fsync,
+	.vop_getpages =		ffs_getpages,
+	.vop_read =		ffs_read,
+	.vop_reallocblks =	ffs_reallocblks,
+	.vop_write =		ffs_write,
+	.vop_closeextattr =	ffs_closeextattr,
+	.vop_deleteextattr =	ffs_deleteextattr,
+	.vop_getextattr =		ffs_getextattr,
+	.vop_listextattr =	ffs_listextattr,
+	.vop_openextattr =	ffs_openextattr,
+	.vop_setextattr =		ffs_setextattr,
 };
-static struct vnodeopv_desc ffs_vnodeop_opv_desc =
-	{ &ffs_vnodeop_p, ffs_vnodeop_entries };
-
-vop_t **ffs_fifoop_p;
-static struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) ufs_vnoperatefifo },
-	{ &vop_fsync_desc,		(vop_t *) ffs_fsync },
-	{ &vop_reallocblks_desc,	(vop_t *) ffs_reallocblks },
-	{ &vop_strategy_desc,		(vop_t *) ffsext_strategy },
-	{ &vop_closeextattr_desc,	(vop_t *) ffs_closeextattr },
-	{ &vop_deleteextattr_desc,	(vop_t *) ffs_deleteextattr },
-	{ &vop_getextattr_desc,		(vop_t *) ffs_getextattr },
-	{ &vop_listextattr_desc,	(vop_t *) ffs_listextattr },
-	{ &vop_openextattr_desc,	(vop_t *) ffs_openextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ffs_setextattr },
-	{ NULL, NULL }
-};
-static struct vnodeopv_desc ffs_fifoop_opv_desc =
-	{ &ffs_fifoop_p, ffs_fifoop_entries };
 
-VNODEOP_SET(ffs_vnodeop_opv_desc);
-VNODEOP_SET(ffs_fifoop_opv_desc);
+struct vop_vector ffs_fifoops = {
+	.vop_default =		&ufs_fifoops,
+	.vop_fsync =		ffs_fsync,
+	.vop_reallocblks =	ffs_reallocblks,
+	.vop_strategy =		ffsext_strategy,
+	.vop_closeextattr =	ffs_closeextattr,
+	.vop_deleteextattr =	ffs_deleteextattr,
+	.vop_getextattr =		ffs_getextattr,
+	.vop_listextattr =	ffs_listextattr,
+	.vop_openextattr =	ffs_openextattr,
+	.vop_setextattr =		ffs_setextattr,
+};
 
 /*
  * Synch an open file.
@@ -1226,9 +1215,9 @@ struct vop_strategy_args {
 	lbn = ap->a_bp->b_lblkno;
 	if (VTOI(vp)->i_fs->fs_magic == FS_UFS2_MAGIC &&
 	    lbn < 0 && lbn >= -NXADDR)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return ufs_vnodeops.vop_strategy(ap);
 	if (vp->v_type == VFIFO)
-		return (ufs_vnoperatefifo((struct vop_generic_args *)ap));
+		return ufs_fifoops.vop_strategy(ap);
 	panic("spec nodes went here");
 }
 
@@ -1252,7 +1241,7 @@ struct vop_openextattr_args {
 	ip = VTOI(ap->a_vp);
 	fs = ip->i_fs;
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_openextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
@@ -1282,7 +1271,7 @@ struct vop_closeextattr_args {
 	ip = VTOI(ap->a_vp);
 	fs = ip->i_fs;
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_closeextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
@@ -1316,7 +1305,7 @@ vop_deleteextattr {
 	fs = ip->i_fs;
 
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_deleteextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
@@ -1406,7 +1395,7 @@ vop_getextattr {
 	fs = ip->i_fs;
 
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_getextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
@@ -1469,7 +1458,7 @@ vop_listextattr {
 	fs = ip->i_fs;
 
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_listextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
@@ -1542,7 +1531,7 @@ vop_setextattr {
 	fs = ip->i_fs;
 
 	if (fs->fs_magic == FS_UFS1_MAGIC)
-		return (ufs_vnoperate((struct vop_generic_args *)ap));
+		return (ufs_vnodeops.vop_setextattr(ap));
 
 	if (ap->a_vp->v_type == VCHR)
 		return (EOPNOTSUPP);
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 5e124e9..3c71d77 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -51,8 +51,8 @@ struct vop_generic_args;
 struct vop_inactive_args;
 struct vop_reclaim_args;
 
-int	ufs_vnoperate(struct vop_generic_args *);
-int	ufs_vnoperatefifo(struct vop_generic_args *);
+extern struct vop_vector ufs_fifoops;
+extern struct vop_vector ufs_vnodeops;
 
 int	 ufs_bmap(struct vop_bmap_args *);
 int	 ufs_bmaparray(struct vnode *, ufs2_daddr_t, ufs2_daddr_t *,
@@ -87,7 +87,7 @@ int	 ufs_reclaim(struct vop_reclaim_args *);
 void	 ffs_snapgone(struct inode *);
 vfs_root_t ufs_root;
 int	 ufs_uninit(struct vfsconf *);
-int	 ufs_vinit(struct mount *, vop_t **, struct vnode **);
+int	 ufs_vinit(struct mount *, struct vop_vector *, struct vnode **);
 
 /*
  * Soft update function prototypes.
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 166e848..ede11e3 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -2020,7 +2020,7 @@ ufsfifo_read(ap)
 
 	uio = ap->a_uio;
 	resid = uio->uio_resid;
-	error = VOCALL(fifo_vnodeop_p, VOFFSET(vop_read), ap);
+	error = fifo_specops.vop_read(ap);
 	ip = VTOI(ap->a_vp);
 	if ((ap->a_vp->v_mount->mnt_flag & MNT_NOATIME) == 0 && ip != NULL &&
 	    (uio->uio_resid != resid || (error == 0 && resid != 0)))
@@ -2046,7 +2046,7 @@ ufsfifo_write(ap)
 
 	uio = ap->a_uio;
 	resid = uio->uio_resid;
-	error = VOCALL(fifo_vnodeop_p, VOFFSET(vop_write), ap);
+	error = fifo_specops.vop_write(ap);
 	ip = VTOI(ap->a_vp);
 	if (ip != NULL && (uio->uio_resid != resid || (error == 0 && resid != 0)))
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
@@ -2073,7 +2073,7 @@ ufsfifo_close(ap)
 	if (vp->v_usecount > 1)
 		ufs_itimes(vp);
 	VI_UNLOCK(vp);
-	return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_close), ap));
+	return (fifo_specops.vop_close(ap));
 }
 
 /*
@@ -2087,7 +2087,7 @@ ufsfifo_kqfilter(ap)
 {
 	int error;
 
-	error = VOCALL(fifo_vnodeop_p, VOFFSET(vop_kqfilter), ap);
+	error = fifo_specops.vop_kqfilter(ap);
 	if (error)
 		error = ufs_kqfilter(ap);
 	return (error);
@@ -2221,7 +2221,7 @@ ufs_advlock(ap)
 int
 ufs_vinit(mntp, fifoops, vpp)
 	struct mount *mntp;
-	vop_t **fifoops;
+	struct vop_vector *fifoops;
 	struct vnode **vpp;
 {
 	struct inode *ip;
@@ -2574,108 +2574,79 @@ filt_ufsvnode(struct knote *kn, long hint)
 }
 
 /* Global vfs data structures for ufs. */
-static vop_t **ufs_vnodeop_p;
-static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) vop_defaultop },
-	{ &vop_fsync_desc,		(vop_t *) vop_panic },
-	{ &vop_read_desc,		(vop_t *) vop_panic },
-	{ &vop_reallocblks_desc,	(vop_t *) vop_panic },
-	{ &vop_write_desc,		(vop_t *) vop_panic },
-	{ &vop_access_desc,		(vop_t *) ufs_access },
-	{ &vop_advlock_desc,		(vop_t *) ufs_advlock },
-	{ &vop_lock_desc,		(vop_t *) ufs_lock },
-	{ &vop_bmap_desc,		(vop_t *) ufs_bmap },
-	{ &vop_cachedlookup_desc,	(vop_t *) ufs_lookup },
-	{ &vop_close_desc,		(vop_t *) ufs_close },
-	{ &vop_create_desc,		(vop_t *) ufs_create },
-	{ &vop_getattr_desc,		(vop_t *) ufs_getattr },
-	{ &vop_inactive_desc,		(vop_t *) ufs_inactive },
-	{ &vop_link_desc,		(vop_t *) ufs_link },
-	{ &vop_lookup_desc,		(vop_t *) vfs_cache_lookup },
-	{ &vop_mkdir_desc,		(vop_t *) ufs_mkdir },
-	{ &vop_mknod_desc,		(vop_t *) ufs_mknod },
-	{ &vop_open_desc,		(vop_t *) ufs_open },
-	{ &vop_pathconf_desc,		(vop_t *) ufs_pathconf },
-	{ &vop_poll_desc,		(vop_t *) vop_stdpoll },
-	{ &vop_kqfilter_desc,		(vop_t *) ufs_kqfilter },
-	{ &vop_print_desc,		(vop_t *) ufs_print },
-	{ &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_rmdir_desc,		(vop_t *) ufs_rmdir },
-	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
+struct vop_vector ufs_vnodeops = {
+	.vop_default =		&default_vnodeops,
+	.vop_fsync =		VOP_PANIC,
+	.vop_read =		VOP_PANIC,
+	.vop_reallocblks =	VOP_PANIC,
+	.vop_write =		VOP_PANIC,
+	.vop_access =		ufs_access,
+	.vop_advlock =		ufs_advlock,
+	.vop_lock =		ufs_lock,
+	.vop_bmap =		ufs_bmap,
+	.vop_cachedlookup =	ufs_lookup,
+	.vop_close =		ufs_close,
+	.vop_create =		ufs_create,
+	.vop_getattr =		ufs_getattr,
+	.vop_inactive =		ufs_inactive,
+	.vop_link =		ufs_link,
+	.vop_lookup =		vfs_cache_lookup,
+	.vop_mkdir =		ufs_mkdir,
+	.vop_mknod =		ufs_mknod,
+	.vop_open =		ufs_open,
+	.vop_pathconf =		ufs_pathconf,
+	.vop_poll =		vop_stdpoll,
+	.vop_kqfilter =		ufs_kqfilter,
+	.vop_print =		ufs_print,
+	.vop_readdir =		ufs_readdir,
+	.vop_readlink =		ufs_readlink,
+	.vop_reclaim =		ufs_reclaim,
+	.vop_remove =		ufs_remove,
+	.vop_rename =		ufs_rename,
+	.vop_rmdir =		ufs_rmdir,
+	.vop_setattr =		ufs_setattr,
 #ifdef MAC
-	{ &vop_setlabel_desc,		(vop_t *) vop_stdsetlabel_ea },
+	.vop_setlabel =		vop_stdsetlabel_ea,
 #endif
-	{ &vop_strategy_desc,		(vop_t *) ufs_strategy },
-	{ &vop_symlink_desc,		(vop_t *) ufs_symlink },
-	{ &vop_whiteout_desc,		(vop_t *) ufs_whiteout },
+	.vop_strategy =		ufs_strategy,
+	.vop_symlink =		ufs_symlink,
+	.vop_whiteout =		ufs_whiteout,
 #ifdef UFS_EXTATTR
-	{ &vop_getextattr_desc,		(vop_t *) ufs_getextattr },
-	{ &vop_deleteextattr_desc,		(vop_t *) ufs_deleteextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ufs_setextattr },
+	.vop_getextattr =		ufs_getextattr,
+	.vop_deleteextattr =		ufs_deleteextattr,
+	.vop_setextattr =		ufs_setextattr,
 #endif
 #ifdef UFS_ACL
-	{ &vop_getacl_desc,		(vop_t *) ufs_getacl },
-	{ &vop_setacl_desc,		(vop_t *) ufs_setacl },
-	{ &vop_aclcheck_desc,		(vop_t *) ufs_aclcheck },
+	.vop_getacl =		ufs_getacl,
+	.vop_setacl =		ufs_setacl,
+	.vop_aclcheck =		ufs_aclcheck,
 #endif
-	{ NULL, NULL }
 };
-static struct vnodeopv_desc ufs_vnodeop_opv_desc =
-	{ &ufs_vnodeop_p, ufs_vnodeop_entries };
-
-static vop_t **ufs_fifoop_p;
-static struct vnodeopv_entry_desc ufs_fifoop_entries[] = {
-	{ &vop_default_desc,		(vop_t *) fifo_vnoperate },
-	{ &vop_fsync_desc,		(vop_t *) vop_panic },
-	{ &vop_access_desc,		(vop_t *) ufs_access },
-	{ &vop_close_desc,		(vop_t *) ufsfifo_close },
-	{ &vop_getattr_desc,		(vop_t *) ufs_getattr },
-	{ &vop_inactive_desc,		(vop_t *) ufs_inactive },
-	{ &vop_kqfilter_desc,		(vop_t *) ufsfifo_kqfilter },
-	{ &vop_print_desc,		(vop_t *) ufs_print },
-	{ &vop_read_desc,		(vop_t *) ufsfifo_read },
-	{ &vop_reclaim_desc,		(vop_t *) ufs_reclaim },
-	{ &vop_setattr_desc,		(vop_t *) ufs_setattr },
+
+struct vop_vector ufs_fifoops = {
+	.vop_default =		&fifo_specops,
+	.vop_fsync =		VOP_PANIC,
+	.vop_access =		ufs_access,
+	.vop_close =		ufsfifo_close,
+	.vop_getattr =		ufs_getattr,
+	.vop_inactive =		ufs_inactive,
+	.vop_kqfilter =		ufsfifo_kqfilter,
+	.vop_print =		ufs_print,
+	.vop_read =		ufsfifo_read,
+	.vop_reclaim =		ufs_reclaim,
+	.vop_setattr =		ufs_setattr,
 #ifdef MAC
-	{ &vop_setlabel_desc,		(vop_t *) vop_stdsetlabel_ea },
+	.vop_setlabel =		vop_stdsetlabel_ea,
 #endif
-	{ &vop_write_desc,		(vop_t *) ufsfifo_write },
+	.vop_write =		ufsfifo_write,
 #ifdef UFS_EXTATTR
-	{ &vop_getextattr_desc,		(vop_t *) ufs_getextattr },
-	{ &vop_deleteextattr_desc,		(vop_t *) ufs_deleteextattr },
-	{ &vop_setextattr_desc,		(vop_t *) ufs_setextattr },
+	.vop_getextattr =		ufs_getextattr,
+	.vop_deleteextattr =		ufs_deleteextattr,
+	.vop_setextattr =		ufs_setextattr,
 #endif
 #ifdef UFS_ACL
-	{ &vop_getacl_desc,		(vop_t *) ufs_getacl },
-	{ &vop_setacl_desc,		(vop_t *) ufs_setacl },
-	{ &vop_aclcheck_desc,		(vop_t *) ufs_aclcheck },
+	.vop_getacl =		ufs_getacl,
+	.vop_setacl =		ufs_setacl,
+	.vop_aclcheck =		ufs_aclcheck,
 #endif
-	{ NULL, NULL }
 };
-static struct vnodeopv_desc ufs_fifoop_opv_desc =
-	{ &ufs_fifoop_p, ufs_fifoop_entries };
-
-VNODEOP_SET(ufs_vnodeop_opv_desc);
-VNODEOP_SET(ufs_fifoop_opv_desc);
-
-int
-ufs_vnoperate(ap)
-	struct vop_generic_args /* {
-		struct vnodeop_desc *a_desc;
-	} */ *ap;
-{
-	return (VOCALL(ufs_vnodeop_p, ap->a_desc->vdesc_offset, ap));
-}
-
-int
-ufs_vnoperatefifo(ap)
-	struct vop_generic_args /* {
-		struct vnodeop_desc *a_desc;
-	} */ *ap;
-{
-	return (VOCALL(ufs_fifoop_p, ap->a_desc->vdesc_offset, ap));
-}