Staticize.

2 files changed, 45 insertions, 42 deletions

diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 12f01df..b9f5234 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.8 1995/05/30 08:07:18 rgrimes Exp $
+ * $Id: umap_vfsops.c,v 1.9 1995/12/03 14:54:40 bde Exp $
  */
 
 /*
@@ -56,29 +56,29 @@
 
 extern int	umapfs_init __P((void));
 
-extern int	umapfs_fhtovp __P((struct mount *mp, struct fid *fidp,
+static int	umapfs_fhtovp __P((struct mount *mp, struct fid *fidp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	umapfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	umapfs_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	umapfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	umapfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	umapfs_root __P((struct mount *mp, struct vnode **vpp));
-extern int	umapfs_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	umapfs_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	umapfs_root __P((struct mount *mp, struct vnode **vpp));
+static int	umapfs_start __P((struct mount *mp, int flags, struct proc *p));
+static int	umapfs_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	umapfs_sync __P((struct mount *mp, int waitfor,
+static int	umapfs_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	umapfs_unmount __P((struct mount *mp, int mntflags,
+static int	umapfs_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	umapfs_vget __P((struct mount *mp, ino_t ino,
+static int	umapfs_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	umapfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	umapfs_vptofh __P((struct vnode *vp, struct fid *fhp));
 
 /*
  * Mount umap layer
  */
-int
+static int
 umapfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -226,7 +226,7 @@ umapfs_mount(mp, path, data, ndp, p)
  * on the underlying filesystem will have been called
  * when that filesystem was mounted.
  */
-int
+static int
 umapfs_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -239,7 +239,7 @@ umapfs_start(mp, flags, p)
 /*
  * Free reference to umap layer
  */
-int
+static int
 umapfs_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -295,7 +295,7 @@ umapfs_unmount(mp, mntflags, p)
 	return (0);
 }
 
-int
+static int
 umapfs_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -319,7 +319,7 @@ umapfs_root(mp, vpp)
 	return (0);
 }
 
-int
+static int
 umapfs_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -330,7 +330,7 @@ umapfs_quotactl(mp, cmd, uid, arg, p)
 	return (VFS_QUOTACTL(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, cmd, uid, arg, p));
 }
 
-int
+static int
 umapfs_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -370,7 +370,7 @@ umapfs_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 umapfs_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -383,7 +383,7 @@ umapfs_sync(mp, waitfor, cred, p)
 	return (0);
 }
 
-int
+static int
 umapfs_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -393,7 +393,7 @@ umapfs_vget(mp, ino, vpp)
 	return (VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp));
 }
 
-int
+static int
 umapfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fidp;
@@ -406,7 +406,7 @@ umapfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	return (VFS_FHTOVP(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, fidp, nam, vpp, exflagsp,credanonp));
 }
 
-int
+static int
 umapfs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -414,7 +414,7 @@ umapfs_vptofh(vp, fhp)
 	return (VFS_VPTOFH(UMAPVPTOLOWERVP(vp), fhp));
 }
 
-struct vfsops umap_vfsops = {
+static struct vfsops umap_vfsops = {
 	umapfs_mount,
 	umapfs_start,
 	umapfs_unmount,
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 8ab0e79..3ce6a4b 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.10 1995/11/09 08:16:25 bde Exp $
+ * $Id: umap_vnops.c,v 1.11 1995/12/03 14:54:41 bde Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
@@ -53,22 +54,24 @@
 #include <sys/buf.h>
 #include <miscfs/umapfs/umap.h>
 
-int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+static int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
+	&umap_bug_bypass, 0, "");
 
-extern int	umap_bwrite __P((struct vop_bwrite_args *ap));
-extern int	umap_bypass __P((struct vop_generic_args *ap));
-extern int	umap_getattr __P((struct vop_getattr_args *ap));
-extern int	umap_inactive __P((struct vop_inactive_args *ap));
-extern int	umap_print __P((struct vop_print_args *ap));
-extern int	umap_reclaim __P((struct vop_reclaim_args *ap));
-extern int	umap_rename __P((struct vop_rename_args *ap));
-extern int	umap_strategy __P((struct vop_strategy_args *ap));
+static int	umap_bwrite __P((struct vop_bwrite_args *ap));
+static int	umap_bypass __P((struct vop_generic_args *ap));
+static int	umap_getattr __P((struct vop_getattr_args *ap));
+static int	umap_inactive __P((struct vop_inactive_args *ap));
+static int	umap_print __P((struct vop_print_args *ap));
+static int	umap_reclaim __P((struct vop_reclaim_args *ap));
+static int	umap_rename __P((struct vop_rename_args *ap));
+static int	umap_strategy __P((struct vop_strategy_args *ap));
 
 /*
  * This is the 10-Apr-92 bypass routine.
  * See null_vnops.c:null_bypass for more details.
  */
-int
+static int
 umap_bypass(ap)
 	struct vop_generic_args /* {
 		struct vnodeop_desc *a_desc;
@@ -259,7 +262,7 @@ umap_bypass(ap)
 /*
  *  We handle getattr to change the fsid.
  */
-int
+static int
 umap_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -333,7 +336,7 @@ umap_getattr(ap)
 	return (0);
 }
 
-int
+static int
 umap_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
@@ -349,7 +352,7 @@ umap_inactive(ap)
 	return (0);
 }
 
-int
+static int
 umap_reclaim(ap)
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
@@ -368,7 +371,7 @@ umap_reclaim(ap)
 	return (0);
 }
 
-int
+static int
 umap_strategy(ap)
 	struct vop_strategy_args /* {
 		struct buf *a_bp;
@@ -388,7 +391,7 @@ umap_strategy(ap)
 	return (error);
 }
 
-int
+static int
 umap_bwrite(ap)
 	struct vop_bwrite_args /* {
 		struct buf *a_bp;
@@ -409,7 +412,7 @@ umap_bwrite(ap)
 }
 
 
-int
+static int
 umap_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -420,7 +423,7 @@ umap_print(ap)
 	return (0);
 }
 
-int
+static int
 umap_rename(ap)
 	struct vop_rename_args  /* {
 		struct vnode *a_fdvp;
@@ -480,7 +483,7 @@ umap_rename(ap)
  *
  */
 vop_t **umap_vnodeop_p;
-struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)umap_bypass },
 
 	{ &vop_getattr_desc, (vop_t *)umap_getattr },
@@ -494,7 +497,7 @@ struct vnodeopv_entry_desc umap_vnodeop_entries[] = {
 
 	{ NULL, NULL }
 };
-struct vnodeopv_desc umap_vnodeop_opv_desc =
+static struct vnodeopv_desc umap_vnodeop_opv_desc =
 	{ &umap_vnodeop_p, umap_vnodeop_entries };
 
 VNODEOP_SET(umap_vnodeop_opv_desc);