From dffac85a9b5e388ce46a14b1cd4cd6743142aaea Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Mon, 11 Dec 1995 09:24:58 +0000
Subject: [PATCH] Staticize.

---
 sys/fs/fifofs/fifo.h              |  6 +---
 sys/fs/fifofs/fifo_vnops.c        | 14 ++++----
 sys/fs/nullfs/null_vfsops.c       | 44 +++++++++++------------
 sys/fs/nullfs/null_vnops.c        | 39 +++++++++++----------
 sys/fs/portalfs/portal_vfsops.c   | 48 ++++++++++++-------------
 sys/fs/portalfs/portal_vnops.c    | 58 +++++++++++++++----------------
 sys/fs/specfs/spec_vnops.c        |  8 ++---
 sys/fs/umapfs/umap_vfsops.c       | 44 +++++++++++------------
 sys/fs/umapfs/umap_vnops.c        | 43 ++++++++++++-----------
 sys/miscfs/fifofs/fifo.h          |  6 +---
 sys/miscfs/fifofs/fifo_vnops.c    | 14 ++++----
 sys/miscfs/kernfs/kernfs_vfsops.c | 52 +++++++++++++--------------
 sys/miscfs/nullfs/null_vfsops.c   | 44 +++++++++++------------
 sys/miscfs/nullfs/null_vnops.c    | 39 +++++++++++----------
 sys/miscfs/portal/portal_vfsops.c | 48 ++++++++++++-------------
 sys/miscfs/portal/portal_vnops.c  | 58 +++++++++++++++----------------
 sys/miscfs/specfs/spec_vnops.c    |  8 ++---
 sys/miscfs/umapfs/umap_vfsops.c   | 44 +++++++++++------------
 sys/miscfs/umapfs/umap_vnops.c    | 43 ++++++++++++-----------
 19 files changed, 332 insertions(+), 328 deletions(-)

diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index a94b425275d2..95c1a9882cbd 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.6 1995/11/09 08:15:25 bde Exp $
+ * $Id: fifo.h,v 1.7 1995/11/21 12:53:52 bde Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
@@ -40,7 +40,6 @@ extern vop_t **fifo_vnodeop_p;
  * Prototypes for fifo operations on vnodes.
  */
 int	fifo_badop __P((void));
-int	fifo_ebadf __P((void));
 int	fifo_printinfo __P((struct vnode *));
 int	fifo_lookup __P((struct vop_lookup_args *));
 #define fifo_create ((int (*) __P((struct  vop_create_args *)))fifo_badop)
@@ -68,11 +67,8 @@ int	fifo_select __P((struct vop_select_args *));
 #define fifo_abortop ((int (*) __P((struct  vop_abortop_args *)))fifo_badop)
 #define fifo_inactive ((int (*) __P((struct  vop_inactive_args *)))nullop)
 #define fifo_reclaim ((int (*) __P((struct  vop_reclaim_args *)))nullop)
-int	fifo_lock __P((struct vop_lock_args *));
-int	fifo_unlock __P((struct vop_unlock_args *));
 int	fifo_bmap __P((struct vop_bmap_args *));
 #define fifo_strategy ((int (*) __P((struct  vop_strategy_args *)))fifo_badop)
-int	fifo_print __P((struct vop_print_args *));
 #define fifo_islocked ((int (*) __P((struct  vop_islocked_args *)))nullop)
 int	fifo_pathconf __P((struct vop_pathconf_args *));
 int	fifo_advlock __P((struct vop_advlock_args *));
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index dee76fb7528b..ecf072da8da6 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.11 1995/09/04 00:20:33 dyson Exp $
+ * $Id: fifo_vnops.c,v 1.12 1995/11/09 08:15:27 bde Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ struct fifoinfo {
 };
 
 vop_t **fifo_vnodeop_p;
-struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc fifo_vnodeop_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 */
@@ -107,7 +107,7 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)fifo_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc fifo_vnodeop_opv_desc =
+static struct vnodeopv_desc fifo_vnodeop_opv_desc =
 	{ &fifo_vnodeop_p, fifo_vnodeop_entries };
 
 VNODEOP_SET(fifo_vnodeop_opv_desc);
@@ -382,7 +382,7 @@ fifo_bmap(ap)
  * At the moment we do not do any locking.
  */
 /* ARGSUSED */
-int
+static int
 fifo_lock(ap)
 	struct vop_lock_args /* {
 		struct vnode *a_vp;
@@ -393,7 +393,7 @@ fifo_lock(ap)
 }
 
 /* ARGSUSED */
-int
+static int
 fifo_unlock(ap)
 	struct vop_unlock_args /* {
 		struct vnode *a_vp;
@@ -459,7 +459,7 @@ fifo_printinfo(vp)
 /*
  * Print out the contents of a fifo vnode.
  */
-int
+static int
 fifo_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -503,7 +503,7 @@ fifo_pathconf(ap)
 /*
  * Fifo failed operation
  */
-int
+static int
 fifo_ebadf()
 {
 
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index b6ebc6c1201b..3fd058286170 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.7 1995/05/30 08:07:01 rgrimes Exp $
+ * $Id: null_vfsops.c,v 1.8 1995/12/03 14:54:23 bde Exp $
  */
 
 /*
@@ -57,29 +57,29 @@
 
 extern int	nullfs_init __P((void));
 
-extern int	nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
+static int	nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	nullfs_root __P((struct mount *mp, struct vnode **vpp));
-extern int	nullfs_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	nullfs_root __P((struct mount *mp, struct vnode **vpp));
+static int	nullfs_start __P((struct mount *mp, int flags, struct proc *p));
+static int	nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	nullfs_sync __P((struct mount *mp, int waitfor,
+static int	nullfs_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	nullfs_unmount __P((struct mount *mp, int mntflags,
+static int	nullfs_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	nullfs_vget __P((struct mount *mp, ino_t ino,
+static int	nullfs_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
 
 /*
  * Mount null layer
  */
-int
+static int
 nullfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -185,7 +185,7 @@ nullfs_mount(mp, path, data, ndp, p)
  * on the underlying filesystem will have been called
  * when that filesystem was mounted.
  */
-int
+static int
 nullfs_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -198,7 +198,7 @@ nullfs_start(mp, flags, p)
 /*
  * Free reference to null layer
  */
-int
+static int
 nullfs_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -254,7 +254,7 @@ nullfs_unmount(mp, mntflags, p)
 	return 0;
 }
 
-int
+static int
 nullfs_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -278,7 +278,7 @@ nullfs_root(mp, vpp)
 	return 0;
 }
 
-int
+static int
 nullfs_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -289,7 +289,7 @@ nullfs_quotactl(mp, cmd, uid, arg, p)
 	return VFS_QUOTACTL(MOUNTTONULLMOUNT(mp)->nullm_vfs, cmd, uid, arg, p);
 }
 
-int
+static int
 nullfs_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -329,7 +329,7 @@ nullfs_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 nullfs_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -342,7 +342,7 @@ nullfs_sync(mp, waitfor, cred, p)
 	return (0);
 }
 
-int
+static int
 nullfs_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -352,7 +352,7 @@ nullfs_vget(mp, ino, vpp)
 	return VFS_VGET(MOUNTTONULLMOUNT(mp)->nullm_vfs, ino, vpp);
 }
 
-int
+static int
 nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fidp;
@@ -365,7 +365,7 @@ nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	return VFS_FHTOVP(MOUNTTONULLMOUNT(mp)->nullm_vfs, fidp, nam, vpp, exflagsp,credanonp);
 }
 
-int
+static int
 nullfs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -373,7 +373,7 @@ nullfs_vptofh(vp, fhp)
 	return VFS_VPTOFH(NULLVPTOLOWERVP(vp), fhp);
 }
 
-struct vfsops null_vfsops = {
+static struct vfsops null_vfsops = {
 	nullfs_mount,
 	nullfs_start,
 	nullfs_unmount,
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 4013f50ed849..676e767a680d 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.9 1995/11/09 08:14:51 bde Exp $
+ * $Id: null_vnops.c,v 1.10 1995/12/03 14:54:24 bde Exp $
  */
 
 /*
@@ -163,6 +163,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -173,15 +174,17 @@
 #include <sys/buf.h>
 #include <miscfs/nullfs/null.h>
 
-int null_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+static int null_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW, 
+	&null_bug_bypass, 0, "");
 
-extern int	null_bypass __P((struct vop_generic_args *ap));
-extern int	null_bwrite __P((struct vop_bwrite_args *ap));
-extern int	null_getattr __P((struct vop_getattr_args *ap));
-extern int	null_inactive __P((struct vop_inactive_args *ap));
-extern int	null_print __P((struct vop_print_args *ap));
-extern int	null_reclaim __P((struct vop_reclaim_args *ap));
-extern int	null_strategy __P((struct vop_strategy_args *ap));
+static int	null_bypass __P((struct vop_generic_args *ap));
+static int	null_bwrite __P((struct vop_bwrite_args *ap));
+static int	null_getattr __P((struct vop_getattr_args *ap));
+static int	null_inactive __P((struct vop_inactive_args *ap));
+static int	null_print __P((struct vop_print_args *ap));
+static int	null_reclaim __P((struct vop_reclaim_args *ap));
+static int	null_strategy __P((struct vop_strategy_args *ap));
 
 /*
  * This is the 10-Apr-92 bypass routine.
@@ -208,7 +211,7 @@ extern int	null_strategy __P((struct vop_strategy_args *ap));
  * - all mapped vnodes are of our vnode-type (NEEDSWORK:
  *   problems on rmdir'ing mount points and renaming?)
  */
-int
+static int
 null_bypass(ap)
 	struct vop_generic_args /* {
 		struct vnodeop_desc *a_desc;
@@ -318,7 +321,7 @@ null_bypass(ap)
 /*
  *  We handle getattr only to change the fsid.
  */
-int
+static int
 null_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -337,7 +340,7 @@ null_getattr(ap)
 }
 
 
-int
+static int
 null_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
@@ -358,7 +361,7 @@ null_inactive(ap)
 	return (0);
 }
 
-int
+static int
 null_reclaim(ap)
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
@@ -382,7 +385,7 @@ null_reclaim(ap)
 }
 
 
-int
+static int
 null_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -399,7 +402,7 @@ null_print(ap)
  * vnode in its arguments.
  * This goes away with a merged VM/buffer cache.
  */
-int
+static int
 null_strategy(ap)
 	struct vop_strategy_args /* {
 		struct buf *a_bp;
@@ -425,7 +428,7 @@ null_strategy(ap)
  * vnode in its arguments.
  * This goes away with a merged VM/buffer cache.
  */
-int
+static int
 null_bwrite(ap)
 	struct vop_bwrite_args /* {
 		struct buf *a_bp;
@@ -449,7 +452,7 @@ null_bwrite(ap)
  * Global vfs data structures
  */
 vop_t **null_vnodeop_p;
-struct vnodeopv_entry_desc null_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc null_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)null_bypass },
 
 	{ &vop_getattr_desc, (vop_t *)null_getattr },
@@ -462,7 +465,7 @@ struct vnodeopv_entry_desc null_vnodeop_entries[] = {
 
 	{ NULL, NULL }
 };
-struct vnodeopv_desc null_vnodeop_opv_desc =
+static struct vnodeopv_desc null_vnodeop_opv_desc =
 	{ &null_vnodeop_p, null_vnodeop_entries };
 
 VNODEOP_SET(null_vnodeop_opv_desc);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 3be61d5fd6cd..6a5b1ba04ca0 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.8 1995/05/30 08:07:05 rgrimes Exp $
+ * $Id: portal_vfsops.c,v 1.9 1995/11/16 11:24:06 bde Exp $
  */
 
 /*
@@ -62,27 +62,27 @@
 #include <sys/un.h>
 #include <miscfs/portal/portal.h>
 
-extern int	portal_init __P((void));
-extern int	portal_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	portal_init __P((void));
+static int	portal_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	portal_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	portal_unmount __P((struct mount *mp, int mntflags,
+static int	portal_start __P((struct mount *mp, int flags, struct proc *p));
+static int	portal_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	portal_root __P((struct mount *mp, struct vnode **vpp));
-extern int	portal_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	portal_root __P((struct mount *mp, struct vnode **vpp));
+static int	portal_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	portal_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	portal_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	portal_sync __P((struct mount *mp, int waitfor,
+static int	portal_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	portal_vget __P((struct mount *mp, ino_t ino,
+static int	portal_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	portal_fhtovp __P((struct mount *mp, struct fid *fhp,
+static int	portal_fhtovp __P((struct mount *mp, struct fid *fhp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	portal_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	portal_vptofh __P((struct vnode *vp, struct fid *fhp));
 
-int
+static int
 portal_init()
 {
 
@@ -92,7 +92,7 @@ portal_init()
 /*
  * Mount the per-process file descriptors (/dev/fd)
  */
-int
+static int
 portal_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -159,7 +159,7 @@ portal_mount(mp, path, data, ndp, p)
 	return (0);
 }
 
-int
+static int
 portal_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -169,7 +169,7 @@ portal_start(mp, flags, p)
 	return (0);
 }
 
-int
+static int
 portal_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -229,7 +229,7 @@ portal_unmount(mp, mntflags, p)
 	return (0);
 }
 
-int
+static int
 portal_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -247,7 +247,7 @@ portal_root(mp, vpp)
 	return (0);
 }
 
-int
+static int
 portal_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -259,7 +259,7 @@ portal_quotactl(mp, cmd, uid, arg, p)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -283,7 +283,7 @@ portal_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 portal_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -294,7 +294,7 @@ portal_sync(mp, waitfor, cred, p)
 	return (0);
 }
 
-int
+static int
 portal_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -304,7 +304,7 @@ portal_vget(mp, ino, vpp)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fhp;
@@ -317,7 +317,7 @@ portal_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -326,7 +326,7 @@ portal_vptofh(vp, fhp)
 	return (EOPNOTSUPP);
 }
 
-struct vfsops portal_vfsops = {
+static struct vfsops portal_vfsops = {
 	portal_mount,
 	portal_start,
 	portal_unmount,
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 75700a7bc279..816f5fa32a51 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.8 1995/11/09 08:15:51 bde Exp $
+ * $Id: portal_vnops.c,v 1.9 1995/12/03 14:54:29 bde Exp $
  */
 
 /*
@@ -65,21 +65,21 @@
 
 static int portal_fileid = PORTAL_ROOTFILEID+1;
 
-extern int	portal_badop __P((void));
+static int	portal_badop __P((void));
 static void	portal_closefd __P((struct proc *p, int fd));
 static int	portal_connect __P((struct socket *so, struct socket *so2));
-extern int	portal_enotsupp __P((void));
-extern int	portal_getattr __P((struct vop_getattr_args *ap));
-extern int	portal_inactive __P((struct vop_inactive_args *ap));
-extern int	portal_lookup __P((struct vop_lookup_args *ap));
-extern int	portal_nullop __P((void));
-extern int	portal_open __P((struct vop_open_args *ap));
-extern int	portal_pathconf __P((struct vop_pathconf_args *ap));
-extern int	portal_print __P((struct vop_print_args *ap));
-extern int	portal_readdir __P((struct vop_readdir_args *ap));
-extern int	portal_reclaim __P((struct vop_reclaim_args *ap));
-extern int	portal_setattr __P((struct vop_setattr_args *ap));
-extern int	portal_vfree __P((struct vop_vfree_args *ap));
+static int	portal_enotsupp __P((void));
+static int	portal_getattr __P((struct vop_getattr_args *ap));
+static int	portal_inactive __P((struct vop_inactive_args *ap));
+static int	portal_lookup __P((struct vop_lookup_args *ap));
+static int	portal_nullop __P((void));
+static int	portal_open __P((struct vop_open_args *ap));
+static int	portal_pathconf __P((struct vop_pathconf_args *ap));
+static int	portal_print __P((struct vop_print_args *ap));
+static int	portal_readdir __P((struct vop_readdir_args *ap));
+static int	portal_reclaim __P((struct vop_reclaim_args *ap));
+static int	portal_setattr __P((struct vop_setattr_args *ap));
+static int	portal_vfree __P((struct vop_vfree_args *ap));
 
 static void
 portal_closefd(p, fd)
@@ -104,7 +104,7 @@ portal_closefd(p, fd)
  * vp is the current namei directory
  * cnp is the name to locate in that directory...
  */
-int
+static int
 portal_lookup(ap)
 	struct vop_lookup_args /* {
 		struct vnode * a_dvp;
@@ -194,7 +194,7 @@ portal_connect(so, so2)
 	return (unp_connect2(so, so2));
 }
 
-int
+static int
 portal_open(ap)
 	struct vop_open_args /* {
 		struct vnode *a_vp;
@@ -427,7 +427,7 @@ bad:;
 	return (error);
 }
 
-int
+static int
 portal_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -474,7 +474,7 @@ portal_getattr(ap)
 	return (0);
 }
 
-int
+static int
 portal_setattr(ap)
 	struct vop_setattr_args /* {
 		struct vnode *a_vp;
@@ -497,7 +497,7 @@ portal_setattr(ap)
  * Fake readdir, just return empty directory.
  * It is hard to deal with '.' and '..' so don't bother.
  */
-int
+static int
 portal_readdir(ap)
 	struct vop_readdir_args /* {
 		struct vnode *a_vp;
@@ -509,7 +509,7 @@ portal_readdir(ap)
 	return (0);
 }
 
-int
+static int
 portal_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
@@ -519,7 +519,7 @@ portal_inactive(ap)
 	return (0);
 }
 
-int
+static int
 portal_reclaim(ap)
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
@@ -540,7 +540,7 @@ portal_reclaim(ap)
 /*
  * Return POSIX pathconf information applicable to special devices.
  */
-int
+static int
 portal_pathconf(ap)
 	struct vop_pathconf_args /* {
 		struct vnode *a_vp;
@@ -578,7 +578,7 @@ portal_pathconf(ap)
  * Print out the contents of a Portal vnode.
  */
 /* ARGSUSED */
-int
+static int
 portal_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -590,7 +590,7 @@ portal_print(ap)
 }
 
 /*void*/
-int
+static int
 portal_vfree(ap)
 	struct vop_vfree_args /* {
 		struct vnode *a_pvp;
@@ -606,7 +606,7 @@ portal_vfree(ap)
 /*
  * Portal vnode unsupported operation
  */
-int
+static int
 portal_enotsupp()
 {
 
@@ -616,7 +616,7 @@ portal_enotsupp()
 /*
  * Portal "should never get here" operation
  */
-int
+static int
 portal_badop()
 {
 
@@ -627,7 +627,7 @@ portal_badop()
 /*
  * Portal vnode null operation
  */
-int
+static int
 portal_nullop()
 {
 
@@ -676,7 +676,7 @@ portal_nullop()
 #define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp)
 
 vop_t **portal_vnodeop_p;
-struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
 	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
@@ -720,7 +720,7 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc portal_vnodeop_opv_desc =
+static struct vnodeopv_desc portal_vnodeop_opv_desc =
 	{ &portal_vnodeop_p, portal_vnodeop_entries };
 
 VNODEOP_SET(portal_vnodeop_opv_desc);
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index e3dbfafd682a..91b96ce0aa72 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.22 1995/12/08 11:17:52 julian Exp $
+ * $Id: spec_vnops.c,v 1.23 1995/12/11 04:56:41 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@
 
 struct vnode *speclisth[SPECHSZ];
 vop_t **spec_vnodeop_p;
-struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc spec_vnodeop_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 */
@@ -107,7 +107,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc spec_vnodeop_opv_desc =
+static struct vnodeopv_desc spec_vnodeop_opv_desc =
 	{ &spec_vnodeop_p, spec_vnodeop_entries };
 
 VNODEOP_SET(spec_vnodeop_opv_desc);
@@ -708,7 +708,7 @@ spec_advlock(ap)
 /*
  * Special device failed operation
  */
-int
+static int
 spec_ebadf()
 {
 
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 12f01df5eb8a..b9f52342b228 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 8ab0e79ee2dd..3ce6a4b90d1d 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);
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index a94b425275d2..95c1a9882cbd 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.6 1995/11/09 08:15:25 bde Exp $
+ * $Id: fifo.h,v 1.7 1995/11/21 12:53:52 bde Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
@@ -40,7 +40,6 @@ extern vop_t **fifo_vnodeop_p;
  * Prototypes for fifo operations on vnodes.
  */
 int	fifo_badop __P((void));
-int	fifo_ebadf __P((void));
 int	fifo_printinfo __P((struct vnode *));
 int	fifo_lookup __P((struct vop_lookup_args *));
 #define fifo_create ((int (*) __P((struct  vop_create_args *)))fifo_badop)
@@ -68,11 +67,8 @@ int	fifo_select __P((struct vop_select_args *));
 #define fifo_abortop ((int (*) __P((struct  vop_abortop_args *)))fifo_badop)
 #define fifo_inactive ((int (*) __P((struct  vop_inactive_args *)))nullop)
 #define fifo_reclaim ((int (*) __P((struct  vop_reclaim_args *)))nullop)
-int	fifo_lock __P((struct vop_lock_args *));
-int	fifo_unlock __P((struct vop_unlock_args *));
 int	fifo_bmap __P((struct vop_bmap_args *));
 #define fifo_strategy ((int (*) __P((struct  vop_strategy_args *)))fifo_badop)
-int	fifo_print __P((struct vop_print_args *));
 #define fifo_islocked ((int (*) __P((struct  vop_islocked_args *)))nullop)
 int	fifo_pathconf __P((struct vop_pathconf_args *));
 int	fifo_advlock __P((struct vop_advlock_args *));
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index dee76fb7528b..ecf072da8da6 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.11 1995/09/04 00:20:33 dyson Exp $
+ * $Id: fifo_vnops.c,v 1.12 1995/11/09 08:15:27 bde Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@ struct fifoinfo {
 };
 
 vop_t **fifo_vnodeop_p;
-struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc fifo_vnodeop_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 */
@@ -107,7 +107,7 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)fifo_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc fifo_vnodeop_opv_desc =
+static struct vnodeopv_desc fifo_vnodeop_opv_desc =
 	{ &fifo_vnodeop_p, fifo_vnodeop_entries };
 
 VNODEOP_SET(fifo_vnodeop_opv_desc);
@@ -382,7 +382,7 @@ fifo_bmap(ap)
  * At the moment we do not do any locking.
  */
 /* ARGSUSED */
-int
+static int
 fifo_lock(ap)
 	struct vop_lock_args /* {
 		struct vnode *a_vp;
@@ -393,7 +393,7 @@ fifo_lock(ap)
 }
 
 /* ARGSUSED */
-int
+static int
 fifo_unlock(ap)
 	struct vop_unlock_args /* {
 		struct vnode *a_vp;
@@ -459,7 +459,7 @@ fifo_printinfo(vp)
 /*
  * Print out the contents of a fifo vnode.
  */
-int
+static int
 fifo_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -503,7 +503,7 @@ fifo_pathconf(ap)
 /*
  * Fifo failed operation
  */
-int
+static int
 fifo_ebadf()
 {
 
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 95c8a5ceb152..d77e2e2174da 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.4 (Berkeley) 1/21/94
- * $Id: kernfs_vfsops.c,v 1.9 1995/05/25 01:35:15 davidg Exp $
+ * $Id: kernfs_vfsops.c,v 1.10 1995/11/16 11:16:13 bde Exp $
  */
 
 /*
@@ -57,31 +57,31 @@
 
 struct vnode *rrootvp;
 
-extern int	cdevvp __P((dev_t dev, struct vnode **vpp));
-extern int	kernfs_init __P((void));
-extern int	kernfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	cdevvp __P((dev_t dev, struct vnode **vpp));
+static int	kernfs_init __P((void));
+static int	kernfs_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	kernfs_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	kernfs_unmount __P((struct mount *mp, int mntflags,
+static int	kernfs_start __P((struct mount *mp, int flags, struct proc *p));
+static int	kernfs_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	kernfs_root __P((struct mount *mp, struct vnode **vpp));
-extern int	kernfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	kernfs_root __P((struct mount *mp, struct vnode **vpp));
+static int	kernfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	kernfs_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	kernfs_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	kernfs_sync __P((struct mount *mp, int waitfor,
+static int	kernfs_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	kernfs_vget __P((struct mount *mp, ino_t ino,
+static int	kernfs_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	kernfs_fhtovp __P((struct mount *mp, struct fid *fhp,
+static int	kernfs_fhtovp __P((struct mount *mp, struct fid *fhp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	kernfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	kernfs_vptofh __P((struct vnode *vp, struct fid *fhp));
 
 /*
  * Create a vnode for a character device.
  */
-int
+static int
 cdevvp(dev, vpp)
 	dev_t dev;
 	struct vnode **vpp;
@@ -108,7 +108,7 @@ cdevvp(dev, vpp)
 	return (0);
 }
 
-int
+static int
 kernfs_init()
 {
 	int cmaj;
@@ -138,7 +138,7 @@ kernfs_init()
 /*
  * Mount the Kernel params filesystem
  */
-int
+static int
 kernfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -188,7 +188,7 @@ kernfs_mount(mp, path, data, ndp, p)
 	return (0);
 }
 
-int
+static int
 kernfs_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -197,7 +197,7 @@ kernfs_start(mp, flags, p)
 	return (0);
 }
 
-int
+static int
 kernfs_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -251,7 +251,7 @@ kernfs_unmount(mp, mntflags, p)
 	return 0;
 }
 
-int
+static int
 kernfs_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -272,7 +272,7 @@ kernfs_root(mp, vpp)
 	return (0);
 }
 
-int
+static int
 kernfs_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -283,7 +283,7 @@ kernfs_quotactl(mp, cmd, uid, arg, p)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 kernfs_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -310,7 +310,7 @@ kernfs_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 kernfs_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -325,7 +325,7 @@ kernfs_sync(mp, waitfor, cred, p)
  * Kernfs flat namespace lookup.
  * Currently unsupported.
  */
-int
+static int
 kernfs_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -336,7 +336,7 @@ kernfs_vget(mp, ino, vpp)
 }
 
 
-int
+static int
 kernfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fhp;
@@ -349,7 +349,7 @@ kernfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 kernfs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -357,7 +357,7 @@ kernfs_vptofh(vp, fhp)
 	return (EOPNOTSUPP);
 }
 
-struct vfsops kernfs_vfsops = {
+static struct vfsops kernfs_vfsops = {
 	kernfs_mount,
 	kernfs_start,
 	kernfs_unmount,
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index b6ebc6c1201b..3fd058286170 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.7 1995/05/30 08:07:01 rgrimes Exp $
+ * $Id: null_vfsops.c,v 1.8 1995/12/03 14:54:23 bde Exp $
  */
 
 /*
@@ -57,29 +57,29 @@
 
 extern int	nullfs_init __P((void));
 
-extern int	nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
+static int	nullfs_fhtovp __P((struct mount *mp, struct fid *fidp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	nullfs_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	nullfs_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	nullfs_root __P((struct mount *mp, struct vnode **vpp));
-extern int	nullfs_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	nullfs_root __P((struct mount *mp, struct vnode **vpp));
+static int	nullfs_start __P((struct mount *mp, int flags, struct proc *p));
+static int	nullfs_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	nullfs_sync __P((struct mount *mp, int waitfor,
+static int	nullfs_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	nullfs_unmount __P((struct mount *mp, int mntflags,
+static int	nullfs_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	nullfs_vget __P((struct mount *mp, ino_t ino,
+static int	nullfs_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	nullfs_vptofh __P((struct vnode *vp, struct fid *fhp));
 
 /*
  * Mount null layer
  */
-int
+static int
 nullfs_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -185,7 +185,7 @@ nullfs_mount(mp, path, data, ndp, p)
  * on the underlying filesystem will have been called
  * when that filesystem was mounted.
  */
-int
+static int
 nullfs_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -198,7 +198,7 @@ nullfs_start(mp, flags, p)
 /*
  * Free reference to null layer
  */
-int
+static int
 nullfs_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -254,7 +254,7 @@ nullfs_unmount(mp, mntflags, p)
 	return 0;
 }
 
-int
+static int
 nullfs_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -278,7 +278,7 @@ nullfs_root(mp, vpp)
 	return 0;
 }
 
-int
+static int
 nullfs_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -289,7 +289,7 @@ nullfs_quotactl(mp, cmd, uid, arg, p)
 	return VFS_QUOTACTL(MOUNTTONULLMOUNT(mp)->nullm_vfs, cmd, uid, arg, p);
 }
 
-int
+static int
 nullfs_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -329,7 +329,7 @@ nullfs_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 nullfs_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -342,7 +342,7 @@ nullfs_sync(mp, waitfor, cred, p)
 	return (0);
 }
 
-int
+static int
 nullfs_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -352,7 +352,7 @@ nullfs_vget(mp, ino, vpp)
 	return VFS_VGET(MOUNTTONULLMOUNT(mp)->nullm_vfs, ino, vpp);
 }
 
-int
+static int
 nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fidp;
@@ -365,7 +365,7 @@ nullfs_fhtovp(mp, fidp, nam, vpp, exflagsp, credanonp)
 	return VFS_FHTOVP(MOUNTTONULLMOUNT(mp)->nullm_vfs, fidp, nam, vpp, exflagsp,credanonp);
 }
 
-int
+static int
 nullfs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -373,7 +373,7 @@ nullfs_vptofh(vp, fhp)
 	return VFS_VPTOFH(NULLVPTOLOWERVP(vp), fhp);
 }
 
-struct vfsops null_vfsops = {
+static struct vfsops null_vfsops = {
 	nullfs_mount,
 	nullfs_start,
 	nullfs_unmount,
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 4013f50ed849..676e767a680d 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.9 1995/11/09 08:14:51 bde Exp $
+ * $Id: null_vnops.c,v 1.10 1995/12/03 14:54:24 bde Exp $
  */
 
 /*
@@ -163,6 +163,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -173,15 +174,17 @@
 #include <sys/buf.h>
 #include <miscfs/nullfs/null.h>
 
-int null_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+static int null_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
+SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW, 
+	&null_bug_bypass, 0, "");
 
-extern int	null_bypass __P((struct vop_generic_args *ap));
-extern int	null_bwrite __P((struct vop_bwrite_args *ap));
-extern int	null_getattr __P((struct vop_getattr_args *ap));
-extern int	null_inactive __P((struct vop_inactive_args *ap));
-extern int	null_print __P((struct vop_print_args *ap));
-extern int	null_reclaim __P((struct vop_reclaim_args *ap));
-extern int	null_strategy __P((struct vop_strategy_args *ap));
+static int	null_bypass __P((struct vop_generic_args *ap));
+static int	null_bwrite __P((struct vop_bwrite_args *ap));
+static int	null_getattr __P((struct vop_getattr_args *ap));
+static int	null_inactive __P((struct vop_inactive_args *ap));
+static int	null_print __P((struct vop_print_args *ap));
+static int	null_reclaim __P((struct vop_reclaim_args *ap));
+static int	null_strategy __P((struct vop_strategy_args *ap));
 
 /*
  * This is the 10-Apr-92 bypass routine.
@@ -208,7 +211,7 @@ extern int	null_strategy __P((struct vop_strategy_args *ap));
  * - all mapped vnodes are of our vnode-type (NEEDSWORK:
  *   problems on rmdir'ing mount points and renaming?)
  */
-int
+static int
 null_bypass(ap)
 	struct vop_generic_args /* {
 		struct vnodeop_desc *a_desc;
@@ -318,7 +321,7 @@ null_bypass(ap)
 /*
  *  We handle getattr only to change the fsid.
  */
-int
+static int
 null_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -337,7 +340,7 @@ null_getattr(ap)
 }
 
 
-int
+static int
 null_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
@@ -358,7 +361,7 @@ null_inactive(ap)
 	return (0);
 }
 
-int
+static int
 null_reclaim(ap)
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
@@ -382,7 +385,7 @@ null_reclaim(ap)
 }
 
 
-int
+static int
 null_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -399,7 +402,7 @@ null_print(ap)
  * vnode in its arguments.
  * This goes away with a merged VM/buffer cache.
  */
-int
+static int
 null_strategy(ap)
 	struct vop_strategy_args /* {
 		struct buf *a_bp;
@@ -425,7 +428,7 @@ null_strategy(ap)
  * vnode in its arguments.
  * This goes away with a merged VM/buffer cache.
  */
-int
+static int
 null_bwrite(ap)
 	struct vop_bwrite_args /* {
 		struct buf *a_bp;
@@ -449,7 +452,7 @@ null_bwrite(ap)
  * Global vfs data structures
  */
 vop_t **null_vnodeop_p;
-struct vnodeopv_entry_desc null_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc null_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)null_bypass },
 
 	{ &vop_getattr_desc, (vop_t *)null_getattr },
@@ -462,7 +465,7 @@ struct vnodeopv_entry_desc null_vnodeop_entries[] = {
 
 	{ NULL, NULL }
 };
-struct vnodeopv_desc null_vnodeop_opv_desc =
+static struct vnodeopv_desc null_vnodeop_opv_desc =
 	{ &null_vnodeop_p, null_vnodeop_entries };
 
 VNODEOP_SET(null_vnodeop_opv_desc);
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 3be61d5fd6cd..6a5b1ba04ca0 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.8 1995/05/30 08:07:05 rgrimes Exp $
+ * $Id: portal_vfsops.c,v 1.9 1995/11/16 11:24:06 bde Exp $
  */
 
 /*
@@ -62,27 +62,27 @@
 #include <sys/un.h>
 #include <miscfs/portal/portal.h>
 
-extern int	portal_init __P((void));
-extern int	portal_mount __P((struct mount *mp, char *path, caddr_t data,
+static int	portal_init __P((void));
+static int	portal_mount __P((struct mount *mp, char *path, caddr_t data,
 				  struct nameidata *ndp, struct proc *p));
-extern int	portal_start __P((struct mount *mp, int flags, struct proc *p));
-extern int	portal_unmount __P((struct mount *mp, int mntflags,
+static int	portal_start __P((struct mount *mp, int flags, struct proc *p));
+static int	portal_unmount __P((struct mount *mp, int mntflags,
 				    struct proc *p));
-extern int	portal_root __P((struct mount *mp, struct vnode **vpp));
-extern int	portal_quotactl __P((struct mount *mp, int cmd, uid_t uid,
+static int	portal_root __P((struct mount *mp, struct vnode **vpp));
+static int	portal_quotactl __P((struct mount *mp, int cmd, uid_t uid,
 				     caddr_t arg, struct proc *p));
-extern int	portal_statfs __P((struct mount *mp, struct statfs *sbp,
+static int	portal_statfs __P((struct mount *mp, struct statfs *sbp,
 				   struct proc *p));
-extern int	portal_sync __P((struct mount *mp, int waitfor,
+static int	portal_sync __P((struct mount *mp, int waitfor,
 				 struct ucred *cred, struct proc *p));
-extern int	portal_vget __P((struct mount *mp, ino_t ino,
+static int	portal_vget __P((struct mount *mp, ino_t ino,
 				 struct vnode **vpp));
-extern int	portal_fhtovp __P((struct mount *mp, struct fid *fhp,
+static int	portal_fhtovp __P((struct mount *mp, struct fid *fhp,
 				   struct mbuf *nam, struct vnode **vpp,
 				   int *exflagsp, struct ucred **credanonp));
-extern int	portal_vptofh __P((struct vnode *vp, struct fid *fhp));
+static int	portal_vptofh __P((struct vnode *vp, struct fid *fhp));
 
-int
+static int
 portal_init()
 {
 
@@ -92,7 +92,7 @@ portal_init()
 /*
  * Mount the per-process file descriptors (/dev/fd)
  */
-int
+static int
 portal_mount(mp, path, data, ndp, p)
 	struct mount *mp;
 	char *path;
@@ -159,7 +159,7 @@ portal_mount(mp, path, data, ndp, p)
 	return (0);
 }
 
-int
+static int
 portal_start(mp, flags, p)
 	struct mount *mp;
 	int flags;
@@ -169,7 +169,7 @@ portal_start(mp, flags, p)
 	return (0);
 }
 
-int
+static int
 portal_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -229,7 +229,7 @@ portal_unmount(mp, mntflags, p)
 	return (0);
 }
 
-int
+static int
 portal_root(mp, vpp)
 	struct mount *mp;
 	struct vnode **vpp;
@@ -247,7 +247,7 @@ portal_root(mp, vpp)
 	return (0);
 }
 
-int
+static int
 portal_quotactl(mp, cmd, uid, arg, p)
 	struct mount *mp;
 	int cmd;
@@ -259,7 +259,7 @@ portal_quotactl(mp, cmd, uid, arg, p)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_statfs(mp, sbp, p)
 	struct mount *mp;
 	struct statfs *sbp;
@@ -283,7 +283,7 @@ portal_statfs(mp, sbp, p)
 	return (0);
 }
 
-int
+static int
 portal_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -294,7 +294,7 @@ portal_sync(mp, waitfor, cred, p)
 	return (0);
 }
 
-int
+static int
 portal_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -304,7 +304,7 @@ portal_vget(mp, ino, vpp)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	struct mount *mp;
 	struct fid *fhp;
@@ -317,7 +317,7 @@ portal_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	return (EOPNOTSUPP);
 }
 
-int
+static int
 portal_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -326,7 +326,7 @@ portal_vptofh(vp, fhp)
 	return (EOPNOTSUPP);
 }
 
-struct vfsops portal_vfsops = {
+static struct vfsops portal_vfsops = {
 	portal_mount,
 	portal_start,
 	portal_unmount,
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 75700a7bc279..816f5fa32a51 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.8 1995/11/09 08:15:51 bde Exp $
+ * $Id: portal_vnops.c,v 1.9 1995/12/03 14:54:29 bde Exp $
  */
 
 /*
@@ -65,21 +65,21 @@
 
 static int portal_fileid = PORTAL_ROOTFILEID+1;
 
-extern int	portal_badop __P((void));
+static int	portal_badop __P((void));
 static void	portal_closefd __P((struct proc *p, int fd));
 static int	portal_connect __P((struct socket *so, struct socket *so2));
-extern int	portal_enotsupp __P((void));
-extern int	portal_getattr __P((struct vop_getattr_args *ap));
-extern int	portal_inactive __P((struct vop_inactive_args *ap));
-extern int	portal_lookup __P((struct vop_lookup_args *ap));
-extern int	portal_nullop __P((void));
-extern int	portal_open __P((struct vop_open_args *ap));
-extern int	portal_pathconf __P((struct vop_pathconf_args *ap));
-extern int	portal_print __P((struct vop_print_args *ap));
-extern int	portal_readdir __P((struct vop_readdir_args *ap));
-extern int	portal_reclaim __P((struct vop_reclaim_args *ap));
-extern int	portal_setattr __P((struct vop_setattr_args *ap));
-extern int	portal_vfree __P((struct vop_vfree_args *ap));
+static int	portal_enotsupp __P((void));
+static int	portal_getattr __P((struct vop_getattr_args *ap));
+static int	portal_inactive __P((struct vop_inactive_args *ap));
+static int	portal_lookup __P((struct vop_lookup_args *ap));
+static int	portal_nullop __P((void));
+static int	portal_open __P((struct vop_open_args *ap));
+static int	portal_pathconf __P((struct vop_pathconf_args *ap));
+static int	portal_print __P((struct vop_print_args *ap));
+static int	portal_readdir __P((struct vop_readdir_args *ap));
+static int	portal_reclaim __P((struct vop_reclaim_args *ap));
+static int	portal_setattr __P((struct vop_setattr_args *ap));
+static int	portal_vfree __P((struct vop_vfree_args *ap));
 
 static void
 portal_closefd(p, fd)
@@ -104,7 +104,7 @@ portal_closefd(p, fd)
  * vp is the current namei directory
  * cnp is the name to locate in that directory...
  */
-int
+static int
 portal_lookup(ap)
 	struct vop_lookup_args /* {
 		struct vnode * a_dvp;
@@ -194,7 +194,7 @@ portal_connect(so, so2)
 	return (unp_connect2(so, so2));
 }
 
-int
+static int
 portal_open(ap)
 	struct vop_open_args /* {
 		struct vnode *a_vp;
@@ -427,7 +427,7 @@ bad:;
 	return (error);
 }
 
-int
+static int
 portal_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -474,7 +474,7 @@ portal_getattr(ap)
 	return (0);
 }
 
-int
+static int
 portal_setattr(ap)
 	struct vop_setattr_args /* {
 		struct vnode *a_vp;
@@ -497,7 +497,7 @@ portal_setattr(ap)
  * Fake readdir, just return empty directory.
  * It is hard to deal with '.' and '..' so don't bother.
  */
-int
+static int
 portal_readdir(ap)
 	struct vop_readdir_args /* {
 		struct vnode *a_vp;
@@ -509,7 +509,7 @@ portal_readdir(ap)
 	return (0);
 }
 
-int
+static int
 portal_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;
@@ -519,7 +519,7 @@ portal_inactive(ap)
 	return (0);
 }
 
-int
+static int
 portal_reclaim(ap)
 	struct vop_reclaim_args /* {
 		struct vnode *a_vp;
@@ -540,7 +540,7 @@ portal_reclaim(ap)
 /*
  * Return POSIX pathconf information applicable to special devices.
  */
-int
+static int
 portal_pathconf(ap)
 	struct vop_pathconf_args /* {
 		struct vnode *a_vp;
@@ -578,7 +578,7 @@ portal_pathconf(ap)
  * Print out the contents of a Portal vnode.
  */
 /* ARGSUSED */
-int
+static int
 portal_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -590,7 +590,7 @@ portal_print(ap)
 }
 
 /*void*/
-int
+static int
 portal_vfree(ap)
 	struct vop_vfree_args /* {
 		struct vnode *a_pvp;
@@ -606,7 +606,7 @@ portal_vfree(ap)
 /*
  * Portal vnode unsupported operation
  */
-int
+static int
 portal_enotsupp()
 {
 
@@ -616,7 +616,7 @@ portal_enotsupp()
 /*
  * Portal "should never get here" operation
  */
-int
+static int
 portal_badop()
 {
 
@@ -627,7 +627,7 @@ portal_badop()
 /*
  * Portal vnode null operation
  */
-int
+static int
 portal_nullop()
 {
 
@@ -676,7 +676,7 @@ portal_nullop()
 #define portal_bwrite ((int (*) __P((struct vop_bwrite_args *)))portal_enotsupp)
 
 vop_t **portal_vnodeop_p;
-struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
 	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
@@ -720,7 +720,7 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc portal_vnodeop_opv_desc =
+static struct vnodeopv_desc portal_vnodeop_opv_desc =
 	{ &portal_vnodeop_p, portal_vnodeop_entries };
 
 VNODEOP_SET(portal_vnodeop_opv_desc);
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index e3dbfafd682a..91b96ce0aa72 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.6 (Berkeley) 4/9/94
- * $Id: spec_vnops.c,v 1.22 1995/12/08 11:17:52 julian Exp $
+ * $Id: spec_vnops.c,v 1.23 1995/12/11 04:56:41 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -62,7 +62,7 @@
 
 struct vnode *speclisth[SPECHSZ];
 vop_t **spec_vnodeop_p;
-struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc spec_vnodeop_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 */
@@ -107,7 +107,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc spec_vnodeop_opv_desc =
+static struct vnodeopv_desc spec_vnodeop_opv_desc =
 	{ &spec_vnodeop_p, spec_vnodeop_entries };
 
 VNODEOP_SET(spec_vnodeop_opv_desc);
@@ -708,7 +708,7 @@ spec_advlock(ap)
 /*
  * Special device failed operation
  */
-int
+static int
 spec_ebadf()
 {
 
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 12f01df5eb8a..b9f52342b228 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/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/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 8ab0e79ee2dd..3ce6a4b90d1d 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/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);