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.

5 files changed, 13 insertions, 13 deletions

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index b65fe716c463..b16a09dab3b9 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -65,7 +65,7 @@ ufs2_daddr_t ffs_blkpref_ufs1(struct inode *, ufs_lbn_t, int, ufs1_daddr_t *);
 ufs2_daddr_t ffs_blkpref_ufs2(struct inode *, ufs_lbn_t, int, ufs2_daddr_t *);
 void	ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
 void	ffs_clusteracct	(struct fs *, struct cg *, ufs1_daddr_t, int);
-int	ffs_fhtovp(struct mount *, struct fid *, struct vnode **);
+vfs_fhtovp_t ffs_fhtovp;
 int	ffs_flushfiles(struct mount *, int, struct thread *);
 void	ffs_fragacct(struct fs *, int, int32_t [], int);
 int	ffs_freefile(struct fs *, struct vnode *, ino_t, int );
@@ -75,8 +75,7 @@ void	ffs_load_inode(struct buf *, struct inode *, struct malloc_type *,
 int	ffs_mountfs(struct vnode *, struct mount *, struct thread *,
 	     struct malloc_type *);
 int	ffs_mountroot(void);
-int	ffs_mount(struct mount *, char *, caddr_t, struct nameidata *,
-	    struct thread *);
+vfs_mount_t ffs_mount;
 int	ffs_reallocblks(struct vop_reallocblks_args *);
 int	ffs_realloccg(struct inode *, ufs2_daddr_t, ufs2_daddr_t,
 	    ufs2_daddr_t, int, int, struct ucred *, struct buf **);
@@ -86,16 +85,16 @@ void	ffs_snapremove(struct vnode *vp);
 int	ffs_snapshot(struct mount *mp, char *snapfile);
 void	ffs_snapshot_mount(struct mount *mp);
 void	ffs_snapshot_unmount(struct mount *mp);
-int	ffs_statfs(struct mount *, struct statfs *, struct thread *);
-int	ffs_sync(struct mount *, int, struct ucred *, struct thread *);
+vfs_statfs_t ffs_statfs;
+vfs_sync_t ffs_sync;
 int	ffs_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *);
-int	ffs_unmount(struct mount *, int, struct thread *);
+vfs_unmount_t ffs_unmount;
 int	ffs_update(struct vnode *, int);
 int	ffs_valloc(struct vnode *, int, struct ucred *, struct vnode **);
 
 int	ffs_vfree(struct vnode *, ino_t, int);
-int	ffs_vget(struct mount *, ino_t, int, struct vnode **);
-int	ffs_vptofh(struct vnode *, struct fid *);
+vfs_vget_t ffs_vget;
+vfs_vptofh_t ffs_vptofh;
 
 extern vop_t **ffs_vnodeop_p;
 extern vop_t **ffs_specop_p;
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e5c62b07d11b..18fa4b8b94ed 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -72,8 +72,8 @@ static int	ffs_sbupdate(struct ufsmount *, int);
 static void	ffs_oldfscompat_read(struct fs *, struct ufsmount *,
 		    ufs2_daddr_t);
 static void	ffs_oldfscompat_write(struct fs *, struct ufsmount *);
-static int	ffs_init(struct vfsconf *);
-static int	ffs_uninit(struct vfsconf *);
+static vfs_init_t ffs_init;
+static vfs_uninit_t ffs_uninit;
 
 static struct vfsops ufs_vfsops = {
 	ffs_mount,
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index df5d1f37a632..49b262924336 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -190,7 +190,7 @@ int	quotaoff(struct thread *td, struct mount *, int);
 int	quotaon(struct thread *td, struct mount *, int, caddr_t);
 int	setquota(struct mount *, u_long, int, caddr_t);
 int	setuse(struct mount *, u_long, int, caddr_t);
-int	ufs_quotactl(struct mount *, int, uid_t, caddr_t, struct thread *td);
+vfs_quotactl_t ufs_quotactl;
 
 #else /* !_KERNEL */
 
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index d4e333c2de9a..cfd27339f77e 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -90,8 +90,8 @@ int	 ufs_lookup(struct vop_cachedlookup_args *);
 int	 ufs_readdir(struct vop_readdir_args *);
 int	 ufs_reclaim(struct vop_reclaim_args *);
 void	 ffs_snapgone(struct inode *);
-int	 ufs_root(struct mount *, struct vnode **);
-int	 ufs_start(struct mount *, int, struct thread *);
+vfs_root_t ufs_root;
+vfs_start_t ufs_start;
 int	 ufs_uninit(struct vfsconf *);
 int	 ufs_vinit(struct mount *, vop_t **, vop_t **, struct vnode **);
 
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index 75e00932486b..b6a054dd3edd 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -42,6 +42,7 @@
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
+#include <sys/mount.h>
 
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>