Staticize.

4 files changed, 44 insertions, 43 deletions

diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index ea83912..5b9623f 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -65,28 +65,14 @@ int	ext2_blkatoff __P((struct vop_blkatoff_args *));
 void	ext2_blkfree __P((struct inode *, daddr_t, long));
 daddr_t	ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t));
 int	ext2_bmap __P((struct vop_bmap_args *));
-int	ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **));
-int	ext2_fsync __P((struct vop_fsync_args *));
 int	ext2_init __P((void));
-int	ext2_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct proc *));
-int	ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int	ext2_mountroot __P((void));
-int	ext2_read __P((struct vop_read_args *));
 int	ext2_reallocblks __P((struct vop_reallocblks_args *));
 int	ext2_reclaim __P((struct vop_reclaim_args *));
 void	ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t));
-int	ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
 int	ext2_truncate __P((struct vop_truncate_args *));
-int	ext2_unmount __P((struct mount *, int, struct proc *));
 int	ext2_update __P((struct vop_update_args *));
 int	ext2_valloc __P((struct vop_valloc_args *));
 int	ext2_vfree __P((struct vop_vfree_args *));
-int	ext2_vget __P((struct mount *, ino_t, struct vnode **));
-int	ext2_vptofh __P((struct vnode *, struct fid *));
-int	ext2_write __P((struct vop_write_args *));
 int 	ext2_lookup __P((struct vop_lookup_args *));
 int 	ext2_readdir __P((struct vop_readdir_args *));
 void	ext2_print_dinode __P((struct dinode *));
@@ -111,9 +97,6 @@ unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
 void	ext2_free_blocks (struct mount * mp, unsigned long block,
 		       unsigned long count);
 void	ext2_free_inode (struct inode * inode);
-int	ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
-int	ext2_reload __P((struct mount *mountp, struct ucred *cred,
-			struct proc *p));
 void	ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
 void	ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
 void	mark_buffer_dirty __P((struct buf *bh));
diff --git a/sys/gnu/ext2fs/ext2_readwrite.c b/sys/gnu/ext2fs/ext2_readwrite.c
index 8deb0b1..093f7fb 100644
--- a/sys/gnu/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/ext2fs/ext2_readwrite.c
@@ -55,7 +55,7 @@
  * Vnode op for reading.
  */
 /* ARGSUSED */
-int
+static int
 READ(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -159,7 +159,7 @@ READ(ap)
 /*
  * Vnode op for writing.
  */
-int
+static int
 WRITE(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 09f4282..1054e49 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -72,9 +72,23 @@
 #include <gnu/ext2fs/ext2_fs.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 
-int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
+	    struct vnode **, int *, struct ucred **));
+static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
+static int ext2_mount __P((struct mount *,
+	    char *, caddr_t, struct nameidata *, struct proc *));
+static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
+static int ext2_mountroot __P((void));
+static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
+			struct proc *p));
+static int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
+static int ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
+static int ext2_unmount __P((struct mount *, int, struct proc *));
+static int ext2_vget __P((struct mount *, ino_t, struct vnode **));
+static int ext2_vptofh __P((struct vnode *, struct fid *));
 
-struct vfsops ext2fs_vfsops = {
+static struct vfsops ext2fs_vfsops = {
 	ext2_mount,
 	ufs_start,		/* empty function */
 	ext2_unmount,
@@ -96,7 +110,7 @@ VFS_SET(ext2fs_vfsops, ext2fs, MOUNT_EXT2FS, 0);
 
 extern u_long nextgennumber;
 #ifdef __FreeBSD__
-int ext2fs_inode_hash_lock;
+static int ext2fs_inode_hash_lock;
 #endif
 
 /*
@@ -110,7 +124,7 @@ static int	compute_sb_data __P((struct vnode * devvp,
 				     struct ext2_super_block * es,
 				     struct ext2_sb_info * fs));
 
-int
+static int
 ext2_mountroot()
 {
 #if !defined(__FreeBSD__)
@@ -173,7 +187,7 @@ ext2_mountroot()
  *
  * mount system call
  */
-int
+static int
 ext2_mount(mp, path, data, ndp, p)
 	register struct mount *mp;	
 	char *path;
@@ -431,7 +445,7 @@ static int compute_sb_data(devvp, es, fs)
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
  */
-int
+static int
 ext2_reload(mountp, cred, p)
 	register struct mount *mountp;
 	struct ucred *cred;
@@ -524,7 +538,7 @@ loop:
 /*
  * Common code for mount and mountroot
  */
-int
+static int
 ext2_mountfs(devvp, mp, p)
 	register struct vnode *devvp;
 	struct mount *mp;
@@ -651,7 +665,7 @@ out:
 /*
  * unmount system call
  */
-int
+static int
 ext2_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -702,7 +716,7 @@ ext2_unmount(mp, mntflags, p)
 /*
  * Flush out all the files in a filesystem.
  */
-int
+static int
 ext2_flushfiles(mp, flags, p)
 	register struct mount *mp;
 	int flags;
@@ -743,7 +757,7 @@ ext2_flushfiles(mp, flags, p)
  * Get file system statistics.
  * taken from ext2/super.c ext2_statfs
  */
-int
+static int
 ext2_statfs(mp, sbp, p)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -798,7 +812,7 @@ ext2_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
-int
+static int
 ext2_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -876,7 +890,7 @@ loop:
  * return the inode locked.  Detection and handling of mount points must be
  * done by the calling routine.
  */
-int
+static int
 ext2_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -1034,7 +1048,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
  * - check that the given client host has export rights and return
  *   those rights via. exflagsp and credanonp
  */
-int
+static int
 ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -1058,7 +1072,7 @@ ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 ext2_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -1077,7 +1091,7 @@ ext2_vptofh(vp, fhp)
 /*
  * Write a superblock and associated information back to disk.
  */
-int
+static int
 ext2_sbupdate(mp, waitfor)
 	struct ufsmount *mp;
 	int waitfor;
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 681097e..bdbafa0 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -79,9 +79,13 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
+static int ext2_fsync __P((struct vop_fsync_args *));
+static int ext2_read __P((struct vop_read_args *));
+static int ext2_write __P((struct vop_write_args *));
+
 /* Global vfs data structures for ufs. */
 vop_t **ext2_vnodeop_p;
-struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)ext2_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
@@ -126,11 +130,11 @@ struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
+static struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
 	{ &ext2_vnodeop_p, ext2_vnodeop_entries };
 
 vop_t **ext2_specop_p;
-struct vnodeopv_entry_desc ext2_specop_entries[] = {
+static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
@@ -175,11 +179,11 @@ struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_specop_opv_desc =
+static struct vnodeopv_desc ext2fs_specop_opv_desc =
 	{ &ext2_specop_p, ext2_specop_entries };
 
 vop_t **ext2_fifoop_p;
-struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
+static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
@@ -224,7 +228,7 @@ struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_fifoop_opv_desc =
+static struct vnodeopv_desc ext2fs_fifoop_opv_desc =
 	{ &ext2_fifoop_p, ext2_fifoop_entries };
 
 #if defined(__FreeBSD__)
@@ -238,9 +242,9 @@ struct vnodeopv_desc ext2fs_fifoop_opv_desc =
  */
 #ifdef DEBUG
 #include <sys/sysctl.h>
-int doclusterread = 1;
+static int doclusterread = 1;
 SYSCTL_INT(_debug, 11, doclusterread, CTLFLAG_RW, &doclusterread, 0, "");
-int doclusterwrite = 1;
+static int doclusterwrite = 1;
 SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
 #endif
 
@@ -261,7 +265,7 @@ SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
  * Synch an open file.
  */
 /* ARGSUSED */
-int
+static int
 ext2_fsync(ap)
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;