Fix non-DIAGNOSTIC (and non-COMPAT*) compilation

3 files changed, 19 insertions, 39 deletions

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index e9a25ec02d7..5bab86e7fc1 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.15 1997/11/07 23:01:37 csapuntz Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.16 1997/11/24 22:42:38 niklas Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -114,39 +114,9 @@ static struct synclist *syncer_workitem_pending;
 
 int vfs_lock __P((struct mount *));
 void vfs_unlock __P((struct mount *));
-struct mount *getvfs __P((fsid_t *));
-long makefstype __P((char *));
-void vattr_null __P((struct vattr *));
-int getnewvnode __P((enum vtagtype, struct mount *, int (**)(void *),
-		     struct vnode **));
 void insmntque __P((struct vnode *, struct mount *));
-int vinvalbuf __P((struct vnode *, int, struct ucred *, struct proc *, int,
-		   int));
-void vflushbuf __P((struct vnode *, int));
-void brelvp __P((struct buf *));
-int bdevvp __P((dev_t, struct vnode **));
-int cdevvp __P((dev_t, struct vnode **));
 int getdevvp __P((dev_t, struct vnode **, enum vtype));
-struct vnode *checkalias __P((struct vnode *, dev_t, struct mount *));
-void vref __P((struct vnode *));
-void vput __P((struct vnode *));
-void vrele __P((struct vnode *));
 int vunref __P((struct vnode *));
-void vhold __P((struct vnode *));
-void holdrele __P((struct vnode *));
-int vflush __P((struct mount *, struct vnode *, int));
-void vgoneall __P((struct vnode *));
-void vgone __P((struct vnode *));
-void vgonel __P((struct vnode *, struct proc *));
-int vcount __P((struct vnode *));
-void vprint __P((char *, struct vnode *));
-int vfs_mountedon __P((struct vnode *));
-int vfs_export __P((struct mount *, struct netexport *, struct export_args *));
-struct netcred *vfs_export_lookup __P((struct mount *, struct netexport *,
-				       struct mbuf *));
-int vaccess __P((mode_t, uid_t, gid_t, mode_t, struct ucred *));
-void vfs_unmountall __P((void));
-void vfs_shutdown __P((void));
 
 int vfs_hang_addrlist __P((struct mount *, struct netexport *,
 				  struct export_args *));
@@ -1157,6 +1127,7 @@ vop_noislocked(v)
 	return (lockstatus(vp->v_vnlock));
 }
 
+#ifdef DIAGNOSTIC
 /*
  * Vnode reference.
  */
@@ -1170,7 +1141,7 @@ vref(vp)
 	vp->v_usecount++;
 	simple_unlock(&vp->v_interlock);
 }
-
+#endif /* DIAGNOSTIC */
 
 int
 vunref(vp)
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 4069c76b453..998efcb888f 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.32 1997/11/20 07:15:38 millert Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.33 1997/11/24 22:42:38 niklas Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -102,7 +102,9 @@ sys_mount(p, v, retval)
 	register struct vnode *vp;
 	register struct mount *mp;
 	int error, flag = 0;
+#if defined(COMPAT_09) || defined(COMPAT_43)
 	u_long fstypenum = 0;
+#endif
 	char fstypename[MFSNAMELEN];
 	struct vattr va;
 	struct nameidata nd;
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 3fe365f26ec..6f27c5b020e 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.11 1997/11/06 05:59:12 csapuntz Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.12 1997/11/24 22:42:34 niklas Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -225,14 +225,18 @@ extern struct simplelock vnode_free_list_slock;
 #define	VREF(vp)	vref(vp)
 
 void	holdrele __P((struct vnode *));
-void	vattr_null __P((struct vattr *));
 void	vhold __P((struct vnode *));
 void	vref __P((struct vnode *));
 #else
 #define	HOLDRELE(vp)	holdrele(vp); 	/* decrease buf or page ref */
 #define	VATTR_NULL(vap)	(*(vap) = va_null)	/* initialize a vattr */
 
-static __inline holdrele(vp)
+static __inline void holdrele __P((struct vnode *));
+static __inline void vhold __P((struct vnode *));
+static __inline void vref __P((struct vnode *));
+
+static __inline void
+holdrele(vp)
 	struct vnode *vp;
 {
 	simple_lock(&vp->v_interlock);
@@ -246,8 +250,10 @@ static __inline holdrele(vp)
  	}
 	simple_unlock(&vp->v_interlock);
 }
+
 #define	VHOLD(vp)	vhold(vp)		/* increase buf or page ref */
-static __inline vhold(vp)
+static __inline void
+vhold(vp)
 	struct vnode *vp;
 {
 	simple_lock(&vp->v_interlock);
@@ -261,8 +267,10 @@ static __inline vhold(vp)
 	vp->v_holdcnt++;
 	simple_unlock(&vp->v_interlock);
 }
+
 #define	VREF(vp)	vref(vp)		/* increase reference */
-static __inline vref(vp)
+static __inline void
+vref(vp)
 	struct vnode *vp;
 {
 	simple_lock(&vp->v_interlock);
@@ -477,7 +485,6 @@ void    sched_sync __P((struct proc *));
 struct vnode *
 	checkalias __P((struct vnode *vp, dev_t nvp_rdev, struct mount *mp));
 void 	vput __P((struct vnode *vp));
-void 	vref __P((struct vnode *vp));
 void 	vrele __P((struct vnode *vp));
 int	vaccess __P((mode_t file_mode, uid_t uid, gid_t gid,
 		     mode_t acc_mode, struct ucred *cred));