Staticize.

6 files changed, 82 insertions, 233 deletions

diff --git a/sys/ufs/lfs/lfs_bio.c b/sys/ufs/lfs/lfs_bio.c
index 045e743b30a4..4816ab222fcb 100644
--- a/sys/ufs/lfs/lfs_bio.c
+++ b/sys/ufs/lfs/lfs_bio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_bio.c	8.4 (Berkeley) 12/30/93
- * $Id: lfs_bio.c,v 1.6 1995/08/11 11:31:16 davidg Exp $
+ * $Id: lfs_bio.c,v 1.7 1995/12/03 11:16:35 bde Exp $
  */
 
 #include <sys/param.h>
@@ -50,7 +50,7 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-extern void	lfs_flush __P((void));
+static void	lfs_flush __P((void));
 
 /*
  * LFS block write function.
@@ -61,7 +61,7 @@ extern void	lfs_flush __P((void));
  */
 int	lfs_allclean_wakeup;		/* Cleaner wakeup address. */
 int	locked_queue_count;		/* XXX Count of locked-down buffers. */
-int	lfs_writing;			/* Set if already kicked off a writer
+static int lfs_writing;			/* Set if already kicked off a writer
 					   because of buffer space */
 /*
 #define WRITE_THRESHHOLD	((nbuf >> 2) - 10)
@@ -133,7 +133,7 @@ lfs_bwrite(ap)
  * buffers, so we can't have more than a single file system.  To make this
  * work for multiple file systems, put the count into the mount structure.
  */
-void
+static void
 lfs_flush()
 {
 	register struct mount *mp;
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 4390bcb8fe9e..64575dd650d5 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.8 1995/11/09 08:14:13 bde Exp $
+ * $Id: lfs_extern.h,v 1.9 1995/12/06 19:46:37 bde Exp $
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
@@ -48,55 +48,33 @@ struct inode;
 struct uio;
 struct mbuf;
 
+
 int	 lfs_balloc __P((struct vnode *, u_long, daddr_t, struct buf **));
 int	 lfs_blkatoff __P((struct vop_blkatoff_args *));
 int	 lfs_bwrite __P((struct vop_bwrite_args *));
 int	 lfs_check __P((struct vnode *, daddr_t));
-int	 lfs_close __P((struct vop_close_args *));
-int	 lfs_create __P((struct vop_create_args *));
-int	 lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **));
 void	 lfs_free_buffer __P((caddr_t, int));
-int	 lfs_fsync __P((struct vop_fsync_args *));
 int	 lfs_gatherblock __P((struct segment *, struct buf *, int *));
-int	 lfs_getattr __P((struct vop_getattr_args *));
 struct dinode *
 	 lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
-int	 lfs_inactive __P((struct vop_inactive_args *));
 int	 lfs_init __P((void));
 int	 lfs_initseg __P((struct lfs *));
-int	 lfs_link __P((struct vop_link_args *));
 int	 lfs_makeinode __P((int, struct nameidata *, struct inode **));
-int	 lfs_mkdir __P((struct vop_mkdir_args *));
-int	 lfs_mknod __P((struct vop_mknod_args *));
-int	 lfs_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct proc *));
 int	 lfs_mountroot __P((void));
 struct buf *
 	 lfs_newbuf __P((struct vnode *, daddr_t, size_t));
-int	 lfs_read __P((struct vop_read_args *));
-int	 lfs_remove __P((struct vop_remove_args *));
-int	 lfs_rmdir __P((struct vop_rmdir_args *));
-int	 lfs_rename __P((struct vop_rename_args *));
 void	 lfs_seglock __P((struct lfs *, unsigned long flags));
 void	 lfs_segunlock __P((struct lfs *));
 int	 lfs_segwrite __P((struct mount *, int));
-int	 lfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	 lfs_symlink __P((struct vop_symlink_args *));
-int	 lfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
 int	 lfs_truncate __P((struct vop_truncate_args *));
-int	 lfs_unmount __P((struct mount *, int, struct proc *));
 int	 lfs_update __P((struct vop_update_args *));
 void	 lfs_updatemeta __P((struct segment *));
 int	 lfs_valloc __P((struct vop_valloc_args *));
 int	 lfs_vcreate __P((struct mount *, ino_t, struct vnode **));
 int	 lfs_vfree __P((struct vop_vfree_args *));
 int	 lfs_vflush __P((struct vnode *));
-int	 lfs_vget __P((struct mount *, ino_t, struct vnode **));
-int	 lfs_vptofh __P((struct vnode *, struct fid *));
 int	 lfs_vref __P((struct vnode *));
 void	 lfs_vunref __P((struct vnode *));
-int	 lfs_write __P((struct vop_write_args *));
 int	 lfs_writeinode __P((struct lfs *, struct segment *, struct inode *));
 int	 lfs_writeseg __P((struct lfs *, struct segment *));
 void	 lfs_writesuper __P((struct lfs *));
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 1fc1dec6744b..e08e07d91aa3 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.14 1995/09/04 00:21:01 dyson Exp $
+ * $Id: lfs_segment.c,v 1.15 1995/12/03 11:16:46 bde Exp $
  */
 
 #include <sys/param.h>
@@ -61,18 +61,18 @@
 #include <ufs/lfs/lfs_extern.h>
 
 extern int	count_lock_queue __P((void));
-extern caddr_t	lfs_alloc_buffer __P((int size));
-extern void	lfs_reclaim_buffers __P((void));
+static caddr_t	lfs_alloc_buffer __P((int size));
+static void	lfs_reclaim_buffers __P((void));
 
 #define MAX_ACTIVE	10
 #define MAX_IO_BUFS 256
 #define MAX_IO_SIZE (1024*512)
-int lfs_total_io_size;
-int lfs_total_io_count;
-volatile int lfs_total_free_count;
-int lfs_free_needed;
-int lfs_in_buffer_reclaim;
-struct lfs_freebuf {
+static int lfs_total_io_size;
+static int lfs_total_io_count;
+static volatile int lfs_total_free_count;
+static int lfs_free_needed;
+static int lfs_in_buffer_reclaim;
+static struct lfs_freebuf {
 	int	size;
 	caddr_t	address;
 } lfs_freebufs[MAX_IO_BUFS];
@@ -88,7 +88,7 @@ lfs_free_buffer( caddr_t address, int size) {
 	}
 }
 
-void
+static void
 lfs_reclaim_buffers() {
 	int i,s;
 	int reclaimed = 0;
@@ -114,7 +114,7 @@ lfs_reclaim_buffers() {
 	}
 }
 
-caddr_t
+static caddr_t
 lfs_alloc_buffer(int size) {
 	int s;
 	caddr_t rtval;
@@ -145,19 +145,19 @@ lfs_alloc_buffer(int size) {
 	((fs)->lfs_dbpseg - ((fs)->lfs_offset - (fs)->lfs_curseg) > \
 	1 << (fs)->lfs_fsbtodb)
 
-void	 lfs_callback __P((struct buf *));
-void	 lfs_gather __P((struct lfs *, struct segment *,
+static void lfs_callback __P((struct buf *));
+static void lfs_gather __P((struct lfs *, struct segment *,
 	     struct vnode *, int (*) __P((struct lfs *, struct buf *))));
 void	 lfs_iset __P((struct inode *, daddr_t, time_t));
-int	 lfs_match_data __P((struct lfs *, struct buf *));
-int	 lfs_match_dindir __P((struct lfs *, struct buf *));
-int	 lfs_match_indir __P((struct lfs *, struct buf *));
-int	 lfs_match_tindir __P((struct lfs *, struct buf *));
-void	 lfs_newseg __P((struct lfs *));
-void	 lfs_shellsort __P((struct buf **, daddr_t *, register int));
-void	 lfs_supercallback __P((struct buf *));
-void	 lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
-void	 lfs_writevnodes __P((struct lfs *fs, struct mount *mp,
+static int lfs_match_data __P((struct lfs *, struct buf *));
+static int lfs_match_dindir __P((struct lfs *, struct buf *));
+static int lfs_match_indir __P((struct lfs *, struct buf *));
+static int lfs_match_tindir __P((struct lfs *, struct buf *));
+static void lfs_newseg __P((struct lfs *));
+static void lfs_shellsort __P((struct buf **, daddr_t *, register int));
+static void lfs_supercallback __P((struct buf *));
+static void lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
+static void lfs_writevnodes __P((struct lfs *fs, struct mount *mp,
 	    struct segment *sp, int dirops));
 
 /* Statistics Counters */
@@ -233,7 +233,7 @@ lfs_vflush(vp)
 	return (0);
 }
 
-void
+static void
 lfs_writevnodes(fs, mp, sp, op)
 	struct lfs *fs;
 	struct mount *mp;
@@ -402,7 +402,7 @@ redo:
 /*
  * Write the dirty blocks associated with a vnode.
  */
-void
+static void
 lfs_writefile(fs, sp, vp)
 	struct lfs *fs;
 	struct segment *sp;
@@ -594,7 +594,7 @@ lfs_gatherblock(sp, bp, sptr)
 	return(0);
 }
 
-void
+static void
 lfs_gather(fs, sp, vp, match)
 	struct lfs *fs;
 	struct segment *sp;
@@ -784,7 +784,7 @@ lfs_initseg(fs)
 /*
  * Return the next segment to write.
  */
-void
+static void
 lfs_newseg(fs)
 	struct lfs *fs;
 {
@@ -1028,7 +1028,7 @@ lfs_writesuper(fs)
  * Logical block number match routines used when traversing the dirty block
  * chain.
  */
-int
+static int
 lfs_match_data(fs, bp)
 	struct lfs *fs;
 	struct buf *bp;
@@ -1036,7 +1036,7 @@ lfs_match_data(fs, bp)
 	return (bp->b_lblkno >= 0);
 }
 
-int
+static int
 lfs_match_indir(fs, bp)
 	struct lfs *fs;
 	struct buf *bp;
@@ -1047,7 +1047,7 @@ lfs_match_indir(fs, bp)
 	return (lbn < 0 && (-lbn - NDADDR) % NINDIR(fs) == 0);
 }
 
-int
+static int
 lfs_match_dindir(fs, bp)
 	struct lfs *fs;
 	struct buf *bp;
@@ -1058,7 +1058,7 @@ lfs_match_dindir(fs, bp)
 	return (lbn < 0 && (-lbn - NDADDR) % NINDIR(fs) == 1);
 }
 
-int
+static int
 lfs_match_tindir(fs, bp)
 	struct lfs *fs;
 	struct buf *bp;
@@ -1096,7 +1096,7 @@ lfs_newbuf(vp, daddr, size)
 	return (bp);
 }
 
-void
+static void
 lfs_callback(bp)
 	struct buf *bp;
 {
@@ -1115,7 +1115,7 @@ lfs_callback(bp)
 
 }
 
-void
+static void
 lfs_supercallback(bp)
 	struct buf *bp;
 {
@@ -1137,7 +1137,7 @@ lfs_supercallback(bp)
  * of logical block numbers to a unsigned in this routine so that the
  * negative block numbers (meta data blocks) sort AFTER the data blocks.
  */
-void
+static void
 lfs_shellsort(bp_array, lb_array, nmemb)
 	struct buf **bp_array;
 	daddr_t *lb_array;
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index b978cfb5c885..09ec9bba99f3 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
- * $Id: lfs_syscalls.c,v 1.12 1995/09/04 00:21:02 dyson Exp $
+ * $Id: lfs_syscalls.c,v 1.13 1995/11/12 06:43:17 bde Exp $
  */
 
 #include <sys/param.h>
@@ -65,8 +65,8 @@
 if (sp->sum_bytes_left < (s)) {		\
 	(void) lfs_writeseg(fs, sp);	\
 }
-struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
-int lfs_fastvget __P((struct mount *, ino_t, daddr_t, struct vnode **,
+static struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
+static int lfs_fastvget __P((struct mount *, ino_t, daddr_t, struct vnode **,
 		     struct dinode *));
 
 /*
@@ -448,7 +448,7 @@ lfs_segwait(p, uap, retval)
  * processing IINFO structures, it may have the ondisk inode already, so
  * don't go retrieving it again.
  */
-int
+static int
 lfs_fastvget(mp, ino, daddr, vpp, dinp)
 	struct mount *mp;
 	ino_t ino;
@@ -557,7 +557,7 @@ lfs_fastvget(mp, ino, daddr, vpp, dinp)
 	*vpp = vp;
 	return (0);
 }
-struct buf *
+static struct buf *
 lfs_fakebuf(vp, lbn, size, uaddr)
 	struct vnode *vp;
 	int lbn;
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 80fb731d6d21..58de7b7190fa 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vfsops.c	8.7 (Berkeley) 4/16/94
- * $Id: lfs_vfsops.c,v 1.11 1995/03/19 14:29:20 davidg Exp $
+ * $Id: lfs_vfsops.c,v 1.12 1995/08/28 09:19:12 julian Exp $
  */
 
 #include <sys/param.h>
@@ -60,7 +60,16 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
+static int lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
+	    struct vnode **, int *, struct ucred **));
+static int lfs_mount __P((struct mount *, char *, caddr_t,
+		struct nameidata *, struct proc *));
+static int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
+static int lfs_statfs __P((struct mount *, struct statfs *, struct proc *));
+static int lfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
+static int lfs_unmount __P((struct mount *, int, struct proc *));
+static int lfs_vget __P((struct mount *, ino_t, struct vnode **));
+static int lfs_vptofh __P((struct vnode *, struct fid *));
 
 struct vfsops lfs_vfsops = {
 	lfs_mount,
@@ -118,7 +127,7 @@ VFS_SET(lfs_vfsops, lfs, MOUNT_LFS, 0);
  *
  *		Root mounts are not currently supported.
  */
-int
+static int
 lfs_mount(mp, path, data, ndp, p)
 	register struct mount *mp;
 	char *path;
@@ -253,7 +262,7 @@ success:
  * Common code for mount and mountroot
  * LFS specific
  */
-int
+static int
 lfs_mountfs(devvp, mp, p)
 	register struct vnode *devvp;
 	struct mount *mp;
@@ -380,7 +389,7 @@ out:
 /*
  * unmount system call
  */
-int
+static int
 lfs_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -439,7 +448,7 @@ lfs_unmount(mp, mntflags, p)
 /*
  * Get file system statistics.
  */
-int
+static int
 lfs_statfs(mp, sbp, p)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -478,7 +487,7 @@ lfs_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
-int
+static int
 lfs_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -500,7 +509,7 @@ lfs_sync(mp, waitfor, cred, p)
  * in core, read it in from the specified device.  Return the inode locked.
  * Detection and handling of mount points must be done by the calling routine.
  */
-int
+static int
 lfs_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -606,7 +615,7 @@ lfs_vget(mp, ino, vpp)
  * what is the relationship between my generational number and the NFS
  * generational number.
  */
-int
+static int
 lfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -627,7 +636,7 @@ lfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 lfs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 948f011fe9f8..49f6b1becda6 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.15 1995/11/09 08:14:15 bde Exp $
+ * $Id: lfs_vnops.c,v 1.16 1995/12/07 12:47:56 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -68,9 +68,17 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
+static int	 lfs_close __P((struct vop_close_args *));
+static int	 lfs_fsync __P((struct vop_fsync_args *));
+static int	 lfs_getattr __P((struct vop_getattr_args *));
+static int	 lfs_inactive __P((struct vop_inactive_args *));
+static int	 lfs_read __P((struct vop_read_args *));
+static int	 lfs_write __P((struct vop_write_args *));
+
+
 /* Global vfs data structures for lfs. */
 vop_t **lfs_vnodeop_p;
-struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)ufs_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
@@ -114,11 +122,11 @@ struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc lfs_vnodeop_opv_desc =
+static struct vnodeopv_desc lfs_vnodeop_opv_desc =
 	{ &lfs_vnodeop_p, lfs_vnodeop_entries };
 
 vop_t **lfs_specop_p;
-struct vnodeopv_entry_desc lfs_specop_entries[] = {
+static struct vnodeopv_entry_desc lfs_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 */
@@ -162,11 +170,11 @@ struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc lfs_specop_opv_desc =
+static struct vnodeopv_desc lfs_specop_opv_desc =
 	{ &lfs_specop_p, lfs_specop_entries };
 
 vop_t **lfs_fifoop_p;
-struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
+static struct vnodeopv_entry_desc lfs_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 */
@@ -210,7 +218,7 @@ struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc lfs_fifoop_opv_desc =
+static struct vnodeopv_desc lfs_fifoop_opv_desc =
 	{ &lfs_fifoop_p, lfs_fifoop_entries };
 
 VNODEOP_SET(lfs_vnodeop_opv_desc);
@@ -225,7 +233,7 @@ VNODEOP_SET(lfs_fifoop_opv_desc);
  * Synch an open file.
  */
 /* ARGSUSED */
-int
+static int
 lfs_fsync(ap)
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;
@@ -265,155 +273,9 @@ lfs_fsync(ap)
 
 #define	MARK_VNODE(dvp)	(dvp)->v_flag |= VDIROP
 
-int
-lfs_symlink(ap)
-	struct vop_symlink_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-		char *a_target;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	ret = ufs_symlink(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_mknod(ap)
-	struct vop_mknod_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	ret = ufs_mknod(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_create(ap)
-	struct vop_create_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	ret = ufs_create(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_mkdir(ap)
-	struct vop_mkdir_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
-{
-	int ret;
 
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	ret = ufs_mkdir(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_remove(ap)
-	struct vop_remove_args /* {
-		struct vnode *a_dvp;
-		struct vnode *a_vp;
-		struct componentname *a_cnp;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	MARK_VNODE(ap->a_vp);
-	ret = ufs_remove(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_rmdir(ap)
-	struct vop_rmdir_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode *a_dvp;
-		struct vnode *a_vp;
-		struct componentname *a_cnp;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_dvp)->i_lfs);
-	MARK_VNODE(ap->a_dvp);
-	MARK_VNODE(ap->a_vp);
-	ret = ufs_rmdir(ap);
-	SET_ENDOP(VTOI(ap->a_dvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_link(ap)
-	struct vop_link_args /* {
-		struct vnode *a_tdvp;
-		struct vnode *a_vp;
-		struct componentname *a_cnp;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_tdvp)->i_lfs);
-	MARK_VNODE(ap->a_tdvp);
-	ret = ufs_link(ap);
-	SET_ENDOP(VTOI(ap->a_tdvp)->i_lfs);
-	return (ret);
-}
-
-int
-lfs_rename(ap)
-	struct vop_rename_args  /* {
-		struct vnode *a_fdvp;
-		struct vnode *a_fvp;
-		struct componentname *a_fcnp;
-		struct vnode *a_tdvp;
-		struct vnode *a_tvp;
-		struct componentname *a_tcnp;
-	} */ *ap;
-{
-	int ret;
-
-	SET_DIROP(VTOI(ap->a_fdvp)->i_lfs);
-	MARK_VNODE(ap->a_fdvp);
-	MARK_VNODE(ap->a_tdvp);
-	ret = ufs_rename(ap);
-	SET_ENDOP(VTOI(ap->a_fdvp)->i_lfs);
-	return (ret);
-}
 /* XXX hack to avoid calling ITIMES in getattr */
-int
+static int
 lfs_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -461,7 +323,7 @@ lfs_getattr(ap)
  * count.
  */
 /* ARGSUSED */
-int
+static int
 lfs_close(ap)
 	struct vop_close_args /* {
 		struct vnode *a_vp;
@@ -487,7 +349,7 @@ lfs_close(ap)
  * Stub inactive routine that avoids calling ufs_inactive in some cases.
  */
 
-int
+static int
 lfs_inactive(ap)
 	struct vop_inactive_args /* {
 		struct vnode *a_vp;