Introduce typedefs for the member functions of struct vfsops and employ

these in the main filesystems.  This does not change the resulting code
but makes the source a little bit more grepable.

Sponsored by:	DARPA and NAI Labs.

3 files changed, 20 insertions, 27 deletions

diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 980612e..2126238 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -64,14 +64,13 @@
 MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure");
 MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part");
 
-static int cd9660_mount(struct mount *,
-	    char *, caddr_t, struct nameidata *, struct thread *);
-static int cd9660_unmount(struct mount *, int, struct thread *);
-static int cd9660_root(struct mount *, struct vnode **);
-static int cd9660_statfs(struct mount *, struct statfs *, struct thread *);
-static int cd9660_vget(struct mount *, ino_t, int, struct vnode **);
-static int cd9660_fhtovp(struct mount *, struct fid *, struct vnode **);
-static int cd9660_vptofh(struct vnode *, struct fid *);
+static vfs_mount_t	cd9660_mount;
+static vfs_unmount_t	cd9660_unmount;
+static vfs_root_t	cd9660_root;
+static vfs_statfs_t	cd9660_statfs;
+static vfs_vget_t	cd9660_vget;
+static vfs_fhtovp_t	cd9660_fhtovp;
+static vfs_vptofh_t	cd9660_vptofh;
 
 static struct vfsops cd9660_vfsops = {
 	cd9660_mount,
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 319a0b7..9b2e174 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -52,19 +52,16 @@
 
 MALLOC_DEFINE(M_DEVFS, "DEVFS", "DEVFS data");
 
-static int	devfs_mount(struct mount *mp, struct nameidata *ndp,
-				  struct thread *td);
-static int	devfs_unmount(struct mount *mp, int mntflags,
-				  struct thread *td);
-static int	devfs_root(struct mount *mp, struct vnode **vpp);
-static int	devfs_statfs(struct mount *mp, struct statfs *sbp,
-				   struct thread *td);
+static vfs_nmount_t	devfs_nmount;
+static vfs_unmount_t	devfs_unmount;
+static vfs_root_t	devfs_root;
+static vfs_statfs_t	devfs_statfs;
 
 /*
  * Mount the filesystem
  */
 static int
-devfs_mount(mp, ndp, td)
+devfs_nmount(mp, ndp, td)
 	struct mount *mp;
 	struct nameidata *ndp;
 	struct thread *td;
@@ -201,7 +198,7 @@ static struct vfsops devfs_vfsops = {
 	vfs_stdinit,
 	vfs_stduninit,
 	vfs_stdextattrctl,
-	devfs_mount,
+	devfs_nmount,
 };
 
 VFS_SET(devfs_vfsops, devfs, VFCF_SYNTHETIC);
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 0ad34a0..f820b2a 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -89,16 +89,13 @@ static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table
 static int	update_mp(struct mount *mp, struct msdosfs_args *argp);
 static int	mountmsdosfs(struct vnode *devvp, struct mount *mp,
 		    struct thread *td, struct msdosfs_args *argp);
-static int	msdosfs_fhtovp(struct mount *, struct fid *, struct vnode **);
-static int	msdosfs_mount(struct mount *, char *, caddr_t,
-		    struct nameidata *, struct thread *);
-static int	msdosfs_root(struct mount *, struct vnode **);
-static int	msdosfs_statfs(struct mount *, struct statfs *,
-		    struct thread *);
-static int	msdosfs_sync(struct mount *, int, struct ucred *,
-		    struct thread *);
-static int	msdosfs_unmount(struct mount *, int, struct thread *);
-static int	msdosfs_vptofh(struct vnode *, struct fid *);
+static vfs_fhtovp_t	msdosfs_fhtovp;
+static vfs_mount_t	msdosfs_mount;
+static vfs_root_t	msdosfs_root;
+static vfs_statfs_t	msdosfs_statfs;
+static vfs_sync_t	msdosfs_sync;
+static vfs_unmount_t	msdosfs_unmount;
+static vfs_vptofh_t	msdosfs_vptofh;
 
 static int
 update_mp(mp, argp)