From e851b29e255be098317af7b3f97041b210839b1d Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@dragonflybsd.org>
Date: Mon, 19 Apr 2004 16:33:49 +0000
Subject: [PATCH] Style(9) cleanup to src/sys/vfs, stage 10/21: nfs.

- Convert K&R-style function definitions to ANSI style.

Submitted-by: Andre Nathan <andre@digirati.com.br>
Additional-reformatting-by: cpressey
---
 sys/vfs/nfs/bootp_subr.c   |  30 +--
 sys/vfs/nfs/krpc_subr.c    |  25 +--
 sys/vfs/nfs/nfs_bio.c      |  40 ++--
 sys/vfs/nfs/nfs_node.c     |  42 ++--
 sys/vfs/nfs/nfs_nqlease.c  |  95 +++------
 sys/vfs/nfs/nfs_serv.c     | 167 +++++-----------
 sys/vfs/nfs/nfs_socket.c   |  91 +++------
 sys/vfs/nfs/nfs_srvcache.c |  17 +-
 sys/vfs/nfs/nfs_subs.c     | 165 ++++-----------
 sys/vfs/nfs/nfs_syscalls.c |  55 ++---
 sys/vfs/nfs/nfs_vnops.c    | 400 +++++++++++++------------------------
 11 files changed, 355 insertions(+), 772 deletions(-)

diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c
index 736128fc49..44cc795041 100644
--- a/sys/vfs/nfs/bootp_subr.c
+++ b/sys/vfs/nfs/bootp_subr.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $	*/
-/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.7 2004/04/16 15:11:53 joerg Exp $	*/
+/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.8 2004/04/19 16:33:49 cpressey Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -294,8 +294,7 @@ void bootpc_init(void);
 
 #ifdef BOOTP_DEBUG
 void
-bootpboot_p_sa(struct sockaddr *sa,
-	       struct sockaddr *ma)
+bootpboot_p_sa(struct sockaddr *sa, struct sockaddr *ma)
 {
 	if (sa == NULL) {
 		printf("(sockaddr *) <null>");
@@ -584,8 +583,7 @@ bootpc_received(struct bootpc_globalcontext *gctx,
 }
 
 static int
-bootpc_call(struct bootpc_globalcontext *gctx,
-	    struct thread *td)
+bootpc_call(struct bootpc_globalcontext *gctx, struct thread *td)
 {
 	struct socket *so;
 	struct sockaddr_in *sin, dst;
@@ -1329,10 +1327,8 @@ print_in_addr(struct in_addr addr)
 }
 
 static void
-bootpc_compose_query(ifctx, gctx, td)
-	struct bootpc_ifcontext *ifctx;
-	struct bootpc_globalcontext *gctx;
-	struct thread *td;
+bootpc_compose_query(struct bootpc_ifcontext *ifctx,
+		     struct bootpc_globalcontext *gctx, struct thread *td)
 {
 	unsigned char *vendp;
 	unsigned char vendor_client[64];
@@ -1419,9 +1415,7 @@ bootpc_hascookie(struct bootp_packet *bp)
 
 static void
 bootpc_tag_helper(struct bootpc_tagcontext *tctx,
-		  unsigned char *start,
-		  int len,
-		  int tag)
+		  unsigned char *start, int len, int tag)
 {
 	unsigned char *j;
 	unsigned char *ej;
@@ -1464,10 +1458,8 @@ bootpc_tag_helper(struct bootpc_tagcontext *tctx,
 
 
 static unsigned char *
-bootpc_tag(struct bootpc_tagcontext *tctx,
-	   struct bootp_packet *bp,
-	   int len,
-	   int tag)
+bootpc_tag(struct bootpc_tagcontext *tctx, struct bootp_packet *bp,
+	   int len, int tag)
 {
 	unsigned char *j;
 	unsigned char *ej;
@@ -1506,10 +1498,8 @@ bootpc_tag(struct bootpc_tagcontext *tctx,
 
 
 static void
-bootpc_decode_reply(nd, ifctx, gctx)
-	struct nfsv3_diskless *nd;
-	struct bootpc_ifcontext *ifctx;
-	struct bootpc_globalcontext *gctx;
+bootpc_decode_reply(struct nfsv3_diskless *nd, struct bootpc_ifcontext *ifctx,
+		    struct bootpc_globalcontext *gctx)
 {
 	char *p;
 	unsigned int ip;
diff --git a/sys/vfs/nfs/krpc_subr.c b/sys/vfs/nfs/krpc_subr.c
index d35056aeb0..ce9eddeb71 100644
--- a/sys/vfs/nfs/krpc_subr.c
+++ b/sys/vfs/nfs/krpc_subr.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
 /* $FreeBSD: src/sys/nfs/krpc_subr.c,v 1.13.2.1 2000/11/20 21:17:14 tegge Exp $	*/
-/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.4 2003/08/07 21:17:42 dillon Exp $	*/
+/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.5 2004/04/19 16:33:49 cpressey Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -125,11 +125,10 @@ struct rpc_reply {
  * Returns non-zero error on failure.
  */
 int
-krpc_portmap(sin,  prog, vers, portp, td)
-	struct sockaddr_in *sin;		/* server address */
-	u_int prog, vers;	/* host order */
-	u_int16_t *portp;	/* network order */
-	struct thread *td;
+krpc_portmap(struct sockaddr_in *sin,	/* server address */
+	     u_int prog, u_int vers,	/* host order */
+	     u_int16_t *portp,		/* network order */
+	     struct thread *td)
 {
 	struct sdata {
 		u_int32_t prog;		/* call program */
@@ -186,12 +185,10 @@ krpc_portmap(sin,  prog, vers, portp, td)
  * the address from whence the response came is saved there.
  */
 int
-krpc_call(sa, prog, vers, func, data, from_p, td)
-	struct sockaddr_in *sa;
-	u_int prog, vers, func;
-	struct mbuf **data;	/* input/output */
-	struct sockaddr **from_p;	/* output */
-	struct thread *td;
+krpc_call(struct sockaddr_in *sa, u_int prog, u_int vers, u_int func,
+	  struct mbuf **data,		/* input/output */
+	  struct sockaddr **from_p,	/* output */
+	  struct thread *td)
 {
 	struct socket *so;
 	struct sockaddr_in *sin, ssin;
@@ -457,9 +454,7 @@ struct xdr_string {
 };
 
 struct mbuf *
-xdr_string_encode(str, len)
-	char *str;
-	int len;
+xdr_string_encode(char *str, int len)
 {
 	struct mbuf *m;
 	struct xdr_string *xs;
diff --git a/sys/vfs/nfs/nfs_bio.c b/sys/vfs/nfs/nfs_bio.c
index 8c66bbeab6..8b86902052 100644
--- a/sys/vfs/nfs/nfs_bio.c
+++ b/sys/vfs/nfs/nfs_bio.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_bio.c,v 1.83.2.4 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.12 2004/02/13 18:52:35 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.13 2004/04/19 16:33:49 cpressey Exp $
  */
 
 
@@ -74,16 +74,12 @@ extern struct nfsstats nfsstats;
 
 /*
  * Vnode op for VM getpages.
+ *
+ * nfs_getpages(struct vnode *a_vp, vm_page_t *a_m, int a_count,
+ *		int a_reqpage, vm_ooffset_t a_offset)
  */
 int
-nfs_getpages(ap)
-	struct vop_getpages_args /* {
-		struct vnode *a_vp;
-		vm_page_t *a_m;
-		int a_count;
-		int a_reqpage;
-		vm_ooffset_t a_offset;
-	} */ *ap;
+nfs_getpages(struct vop_getpages_args *ap)
 {
 	struct thread *td = curthread;		/* XXX */
 	int i, error, nextoff, size, toff, count, npages;
@@ -230,17 +226,12 @@ nfs_getpages(ap)
 
 /*
  * Vnode op for VM putpages.
+ *
+ * nfs_putpages(struct vnode *a_vp, vm_page_t *a_m, int a_count, int a_sync,
+ *		int *a_rtvals, vm_ooffset_t a_offset)
  */
 int
-nfs_putpages(ap)
-	struct vop_putpages_args /* {
-		struct vnode *a_vp;
-		vm_page_t *a_m;
-		int a_count;
-		int a_sync;
-		int *a_rtvals;
-		vm_ooffset_t a_offset;
-	} */ *ap;
+nfs_putpages(struct vop_putpages_args *ap)
 {
 	struct thread *td = curthread;
 	struct uio uio;
@@ -707,15 +698,12 @@ again:
 
 /*
  * Vnode op for write using bio
+ *
+ * nfs_write(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *	     struct ucred *a_cred)
  */
 int
-nfs_write(ap)
-	struct vop_write_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfs_write(struct vop_write_args *ap)
 {
 	int biosize;
 	struct uio *uio = ap->a_uio;
@@ -1135,7 +1123,7 @@ nfs_getcacheblk(struct vnode *vp, daddr_t bn, int size, struct thread *td)
  */
 int
 nfs_vinvalbuf(struct vnode *vp, int flags,
-	struct thread *td, int intrflg)
+	      struct thread *td, int intrflg)
 {
 	struct nfsnode *np = VTONFS(vp);
 	struct nfsmount *nmp = VFSTONFS(vp->v_mount);
diff --git a/sys/vfs/nfs/nfs_node.c b/sys/vfs/nfs/nfs_node.c
index 3a877a0c7c..85e8940176 100644
--- a/sys/vfs/nfs/nfs_node.c
+++ b/sys/vfs/nfs/nfs_node.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/nfs/nfs_node.c,v 1.36.2.3 2002/01/05 22:25:04 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.9 2004/03/01 06:33:21 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.10 2004/04/19 16:33:49 cpressey Exp $
  */
 
 
@@ -68,7 +68,7 @@ static u_long nfsnodehash;
  * and build nfsnode free list.
  */
 void
-nfs_nhinit()
+nfs_nhinit(void)
 {
 	nfsnode_zone = zinit("NFSNODE", sizeof(struct nfsnode), 0, 0, 1);
 	nfsnodehashtbl = hashinit(desiredvnodes, M_NFSHASH, &nfsnodehash);
@@ -187,12 +187,11 @@ loop:
 	return (0);
 }
 
+/*
+ * nfs_inactive(struct vnode *a_vp, struct thread *a_td)
+ */
 int
-nfs_inactive(ap)
-	struct vop_inactive_args /* {
-		struct vnode *a_vp;
-		struct thread *a_td;
-	} */ *ap;
+nfs_inactive(struct vop_inactive_args *ap)
 {
 	struct nfsnode *np;
 	struct sillyrename *sp;
@@ -237,12 +236,11 @@ nfs_inactive(ap)
 
 /*
  * Reclaim an nfsnode so that it can be used for other purposes.
+ *
+ * nfs_reclaim(struct vnode *a_vp)
  */
 int
-nfs_reclaim(ap)
-	struct vop_reclaim_args /* {
-		struct vnode *a_vp;
-	} */ *ap;
+nfs_reclaim(struct vop_reclaim_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -296,12 +294,11 @@ nfs_reclaim(ap)
 #if 0
 /*
  * Lock an nfsnode
+ *
+ * nfs_lock(struct vnode *a_vp)
  */
 int
-nfs_lock(ap)
-	struct vop_lock_args /* {
-		struct vnode *a_vp;
-	} */ *ap;
+nfs_lock(struct vop_lock_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 
@@ -348,12 +345,11 @@ nfs_lock(ap)
 
 /*
  * Unlock an nfsnode
+ *
+ * nfs_unlock(struct vnode *a_vp)
  */
 int
-nfs_unlock(ap)
-	struct vop_unlock_args /* {
-		struct vnode *a_vp;
-	} */ *ap;
+nfs_unlock(struct vop_unlock_args *ap)
 {
 #if 0
 	struct vnode* vp = ap->a_vp;
@@ -375,13 +371,11 @@ nfs_unlock(ap)
 
 /*
  * Check for a locked nfsnode
+ *
+ * nfs_islocked(struct vnode *a_vp, struct thread *a_td)
  */
 int
-nfs_islocked(ap)
-	struct vop_islocked_args /* {
-		struct vnode *a_vp;
-		struct thread *a_td;
-	} */ *ap;
+nfs_islocked(struct vop_islocked_args *ap)
 {
 	return VTONFS(ap->a_vp)->n_flag & NLOCKED ? 1 : 0;
 }
diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c
index ff5ee86c42..50d162a8f8 100644
--- a/sys/vfs/nfs/nfs_nqlease.c
+++ b/sys/vfs/nfs/nfs_nqlease.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
  * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $
- * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.14 2004/03/01 06:33:21 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.15 2004/04/19 16:33:49 cpressey Exp $
  */
 
 
@@ -170,16 +170,10 @@ extern struct nfsstats nfsstats;
  *     queue yet. (Ditto for the splsoftclock() and splx(s) calls)
  */
 int
-nqsrv_getlease(vp, duration, flags, slp, td, nam, cachablep, frev, cred)
-	struct vnode *vp;
-	u_int32_t *duration;
-	int flags;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct sockaddr *nam;
-	int *cachablep;
-	u_quad_t *frev;
-	struct ucred *cred;
+nqsrv_getlease(struct vnode *vp, u_int32_t *duration, int flags,
+	       struct nfssvc_sock *slp, struct thread *td,
+	       struct sockaddr *nam, int *cachablep, u_quad_t *frev,
+	       struct ucred *cred)
 {
 	struct nqlease *lp;
 	struct nqfhhashhead *lpp = NULL;
@@ -337,7 +331,7 @@ doreply:
  */
 void
 nqnfs_lease_check(struct vnode *vp, struct thread *td,
-	struct ucred *cred, int flag)
+		  struct ucred *cred, int flag)
 {
 	u_int32_t duration = 0;
 	int cache;
@@ -347,14 +341,12 @@ nqnfs_lease_check(struct vnode *vp, struct thread *td,
 		td, (struct sockaddr *)0, &cache, &frev, cred);
 }
 
+/*
+ * nqnfs_vop_lease_check(struct vnode *a_vp, struct thread *a_td,
+ *			 struct ucred *a_cred, int a_flag)
+ */
 int
-nqnfs_vop_lease_check(ap)
-	struct vop_lease_args /* {
-		struct vnode *a_vp;
-		struct thread *a_td;
-		struct ucred *a_cred;
-		int a_flag;
-	} */ *ap;
+nqnfs_vop_lease_check(struct vop_lease_args *ap)
 {
 	u_int32_t duration = 0;
 	int cache;
@@ -371,10 +363,7 @@ nqnfs_vop_lease_check(ap)
  * Add a host to an nqhost structure for a lease.
  */
 static void
-nqsrv_addhost(lph, slp, nam)
-	struct nqhost *lph;
-	struct nfssvc_sock *slp;
-	struct sockaddr *nam;
+nqsrv_addhost(struct nqhost *lph, struct nfssvc_sock *slp, struct sockaddr *nam)
 {
 	struct sockaddr_in *saddr;
 	struct socket *nsso;
@@ -400,9 +389,7 @@ nqsrv_addhost(lph, slp, nam)
  * Update the lease expiry time and position it in the timer queue correctly.
  */
 static void
-nqsrv_instimeq(lp, duration)
-	struct nqlease *lp;
-	u_int32_t duration;
+nqsrv_instimeq(struct nqlease *lp, u_int32_t duration)
 {
 	struct nqlease *tlp;
 	time_t newexpiry;
@@ -439,10 +426,7 @@ nqsrv_instimeq(lp, duration)
  * The local host is indicated by the special value of NQLOCALSLP for slp.
  */
 static int
-nqsrv_cmpnam(slp, nam, lph)
-	struct nfssvc_sock *slp;
-	struct sockaddr *nam;
-	struct nqhost *lph;
+nqsrv_cmpnam(struct nfssvc_sock *slp, struct sockaddr *nam, struct nqhost *lph)
 {
 	struct sockaddr_in *saddr;
 	struct sockaddr *addr;
@@ -481,12 +465,9 @@ nqsrv_cmpnam(slp, nam, lph)
  * Send out eviction notice messages to all other hosts for the lease.
  */
 static void
-nqsrv_send_eviction(vp, lp, slp, nam, cred)
-	struct vnode *vp;
-	struct nqlease *lp;
-	struct nfssvc_sock *slp;
-	struct sockaddr *nam;
-	struct ucred *cred;
+nqsrv_send_eviction(struct vnode *vp, struct nqlease *lp,
+		    struct nfssvc_sock *slp, struct sockaddr *nam,
+		    struct ucred *cred)
 {
 	struct nqhost *lph = &lp->lc_host;
 	int siz;
@@ -594,8 +575,7 @@ nextone:
  * this server OR when it expires do to timeout.
  */
 static void
-nqsrv_waitfor_expiry(lp)
-	struct nqlease *lp;
+nqsrv_waitfor_expiry(struct nqlease *lp)
 {
 	struct nqhost *lph;
 	int i;
@@ -636,7 +616,7 @@ tryagain:
  *   else dequeue and free
  */
 void
-nqnfs_serverd()
+nqnfs_serverd(void)
 {
 	struct nqlease *lp;
 	struct nqhost *lph;
@@ -719,7 +699,7 @@ nqnfs_serverd()
  */
 int
 nqnfsrv_getlease(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	struct thread *td, struct mbuf **mrq)
+		 struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -776,7 +756,7 @@ nqnfsrv_getlease(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
  */
 int
 nqnfsrv_vacated(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	struct thread *td, struct mbuf **mrq)
+		struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -894,9 +874,7 @@ nfsmout:
  * Client vacated message function.
  */
 static int
-nqnfs_vacated(vp, cred)
-	struct vnode *vp;
-	struct ucred *cred;
+nqnfs_vacated(struct vnode *vp, struct ucred *cred)
 {
 	caddr_t cp;
 	int i;
@@ -945,10 +923,8 @@ nfsmout:
  * Called for client side callbacks
  */
 int
-nqnfs_callback(nmp, mrep, md, dpos)
-	struct nfsmount *nmp;
-	struct mbuf *mrep, *md;
-	caddr_t dpos;
+nqnfs_callback(struct nfsmount *nmp, struct mbuf *mrep, struct mbuf *md,
+	       caddr_t dpos)
 {
 	struct vnode *vp;
 	u_int32_t *tl;
@@ -1008,13 +984,8 @@ nqnfs_callback(nmp, mrep, md, dpos)
  * the list asynchronously.
  */
 int
-nqnfs_clientd(nmp, cred, ncd, flag, argp, td)
-	struct nfsmount *nmp;
-	struct ucred *cred;
-	struct nfsd_cargs *ncd;
-	int flag;
-	caddr_t argp;
-	struct thread *td;
+nqnfs_clientd(struct nfsmount *nmp, struct ucred *cred, struct nfsd_cargs *ncd,
+	      int flag, caddr_t argp, struct thread *td)
 {
 	struct nfsnode *np;
 	struct vnode *vp;
@@ -1219,8 +1190,7 @@ nqnfs_lease_updatetime(int deltat)
  * Lock a server lease.
  */
 static void
-nqsrv_locklease(lp)
-	struct nqlease *lp;
+nqsrv_locklease(struct nqlease *lp)
 {
 
 	while (lp->lc_flag & LC_LOCKED) {
@@ -1235,8 +1205,7 @@ nqsrv_locklease(lp)
  * Unlock a server lease.
  */
 static void
-nqsrv_unlocklease(lp)
-	struct nqlease *lp;
+nqsrv_unlocklease(struct nqlease *lp)
 {
 
 	lp->lc_flag &= ~LC_LOCKED;
@@ -1249,12 +1218,8 @@ nqsrv_unlocklease(lp)
  * Update a client lease.
  */
 void
-nqnfs_clientlease(nmp, np, rwflag, cachable, expiry, frev)
-	struct nfsmount *nmp;
-	struct nfsnode *np;
-	int rwflag, cachable;
-	time_t expiry;
-	u_quad_t frev;
+nqnfs_clientlease(struct nfsmount *nmp, struct nfsnode *np, int rwflag,
+		  int cachable, time_t expiry, u_quad_t frev)
 {
 	struct nfsnode *tp;
 
diff --git a/sys/vfs/nfs/nfs_serv.c b/sys/vfs/nfs/nfs_serv.c
index a281ed58b8..9d8e93b32f 100644
--- a/sys/vfs/nfs/nfs_serv.c
+++ b/sys/vfs/nfs/nfs_serv.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
  * $FreeBSD: src/sys/nfs/nfs_serv.c,v 1.93.2.6 2002/12/29 18:19:53 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.13 2004/03/01 06:33:21 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.14 2004/04/19 16:33:49 cpressey Exp $
  */
 
 /*
@@ -172,7 +172,7 @@ ndclear(struct nameidata *nd)
  */
 int
 nfsrv3_access(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	struct thread *td, struct mbuf **mrq)
+	      struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -242,11 +242,8 @@ nfsmout:
  * nfs getattr service
  */
 int
-nfsrv_getattr(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_getattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	      struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -299,11 +296,8 @@ nfsmout:
  * nfs setattr service
  */
 int
-nfsrv_setattr(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_setattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	      struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -448,11 +442,8 @@ nfsmout:
  * nfs lookup rpc
  */
 int
-nfsrv_lookup(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -642,11 +633,8 @@ nfsmout:
  * nfs readlink service
  */
 int
-nfsrv_readlink(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	       struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -755,11 +743,8 @@ nfsmout:
  * nfs read service
  */
 int
-nfsrv_read(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	   struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -1006,11 +991,8 @@ nfsmout:
  * nfs write service
  */
 int
-nfsrv_write(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -1215,11 +1197,8 @@ nfsmout:
  * Jan. 1994.
  */
 int
-nfsrv_writegather(ndp, slp, td, mrq)
-	struct nfsrv_descript **ndp;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_writegather(struct nfsrv_descript **ndp, struct nfssvc_sock *slp,
+		  struct thread *td, struct mbuf **mrq)
 {
 	struct iovec *ivp;
 	struct mbuf *mp;
@@ -1589,11 +1568,8 @@ nfsrvw_coalesce(struct nfsrv_descript *owp, struct nfsrv_descript *nfsd)
  * now does a truncate to 0 length via. setattr if it already exists
  */
 int
-nfsrv_create(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -1873,11 +1849,8 @@ nfsmout:
  * nfs v3 mknod service
  */
 int
-nfsrv_mknod(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2056,11 +2029,8 @@ nfsmout:
  * nfs remove service
  */
 int
-nfsrv_remove(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2147,11 +2117,8 @@ nfsmout:
  * nfs rename service
  */
 int
-nfsrv_rename(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2369,11 +2336,8 @@ nfsmout:
  * nfs link service
  */
 int
-nfsrv_link(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_link(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	   struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2483,11 +2447,8 @@ nfsmout:
  * nfs symbolic link service
  */
 int
-nfsrv_symlink(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	      struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2658,11 +2619,8 @@ nfsmout:
  * nfs mkdir service
  */
 int
-nfsrv_mkdir(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2795,11 +2753,8 @@ nfsmout:
  * nfs rmdir service
  */
 int
-nfsrv_rmdir(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_rmdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -2937,11 +2892,8 @@ struct flrep {
 };
 
 int
-nfsrv_readdir(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	      struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3232,11 +3184,8 @@ nfsmout:
 }
 
 int
-nfsrv_readdirplus(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+		  struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3571,11 +3520,8 @@ nfsmout:
  * nfs commit service
  */
 int
-nfsrv_commit(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_commit(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3708,11 +3654,8 @@ nfsmout:
  * nfs statfs service
  */
 int
-nfsrv_statfs(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_statfs(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3795,11 +3738,8 @@ nfsmout:
  * nfs fsinfo service
  */
 int
-nfsrv_fsinfo(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_fsinfo(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	     struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3877,11 +3817,8 @@ nfsmout:
  * nfs pathconf service
  */
 int
-nfsrv_pathconf(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_pathconf(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	       struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md;
 	struct sockaddr *nam = nfsd->nd_nam;
@@ -3956,11 +3893,8 @@ nfsmout:
  */
 /* ARGSUSED */
 int
-nfsrv_null(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_null(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	   struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep;
 	caddr_t bpos;
@@ -3981,11 +3915,8 @@ nfsrv_null(nfsd, slp, td, mrq)
  */
 /* ARGSUSED */
 int
-nfsrv_noop(nfsd, slp, td, mrq)
-	struct nfsrv_descript *nfsd;
-	struct nfssvc_sock *slp;
-	struct thread *td;
-	struct mbuf **mrq;
+nfsrv_noop(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	   struct thread *td, struct mbuf **mrq)
 {
 	struct mbuf *mrep = nfsd->nd_mrep;
 	caddr_t bpos;
@@ -4022,7 +3953,7 @@ nfsrv_noop(nfsd, slp, td, mrq)
  */
 static int
 nfsrv_access(struct vnode *vp, int flags, struct ucred *cred,
-	int rdonly, struct thread *td, int override)
+	     int rdonly, struct thread *td, int override)
 {
 	struct vattr vattr;
 	int error;
diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c
index 9af3e7952f..7a0f534764 100644
--- a/sys/vfs/nfs/nfs_socket.c
+++ b/sys/vfs/nfs/nfs_socket.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.15 2004/04/07 05:15:48 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.16 2004/04/19 16:33:49 cpressey Exp $
  */
 
 /*
@@ -385,8 +385,7 @@ bad:
  * nb: Must be called with the nfs_sndlock() set on the mount point.
  */
 static int
-nfs_reconnect(rep)
-	struct nfsreq *rep;
+nfs_reconnect(struct nfsreq *rep)
 {
 	struct nfsreq *rp;
 	struct nfsmount *nmp = rep->r_nmp;
@@ -414,8 +413,7 @@ nfs_reconnect(rep)
  * NFS disconnect. Clean up and unlink.
  */
 void
-nfs_disconnect(nmp)
-	struct nfsmount *nmp;
+nfs_disconnect(struct nfsmount *nmp)
 {
 	struct socket *so;
 
@@ -428,8 +426,7 @@ nfs_disconnect(nmp)
 }
 
 void
-nfs_safedisconnect(nmp)
-	struct nfsmount *nmp;
+nfs_safedisconnect(struct nfsmount *nmp)
 {
 	struct nfsreq dummyreq;
 
@@ -455,11 +452,8 @@ nfs_safedisconnect(nmp)
  * - do any cleanup required by recoverable socket errors (?)
  */
 int
-nfs_send(so, nam, top, rep)
-	struct socket *so;
-	struct sockaddr *nam;
-	struct mbuf *top;
-	struct nfsreq *rep;
+nfs_send(struct socket *so, struct sockaddr *nam, struct mbuf *top,
+	 struct nfsreq *rep)
 {
 	struct sockaddr *sendnam;
 	int error, soflags, flags;
@@ -752,8 +746,7 @@ errout:
  */
 /* ARGSUSED */
 int
-nfs_reply(myrep)
-	struct nfsreq *myrep;
+nfs_reply(struct nfsreq *myrep)
 {
 	struct nfsreq *rep;
 	struct nfsmount *nmp = myrep->r_nmp;
@@ -931,15 +924,9 @@ nfsmout:
  * nb: always frees up mreq mbuf list
  */
 int
-nfs_request(vp, mrest, procnum, td, cred, mrp, mdp, dposp)
-	struct vnode *vp;
-	struct mbuf *mrest;
-	int procnum;
-	struct thread *td;
-	struct ucred *cred;
-	struct mbuf **mrp;
-	struct mbuf **mdp;
-	caddr_t *dposp;
+nfs_request(struct vnode *vp, struct mbuf *mrest, int procnum,
+	    struct thread *td, struct ucred *cred, struct mbuf **mrp,
+	    struct mbuf **mdp, caddr_t *dposp)
 {
 	struct mbuf *mrep, *m2;
 	struct nfsreq *rep;
@@ -1230,16 +1217,9 @@ nfsmout:
  * siz arg. is used to decide if adding a cluster is worthwhile
  */
 int
-nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
-	int siz;
-	struct nfsrv_descript *nd;
-	struct nfssvc_sock *slp;
-	int err;
-	int cache;
-	u_quad_t *frev;
-	struct mbuf **mrq;
-	struct mbuf **mbp;
-	caddr_t *bposp;
+nfs_rephead(int siz, struct nfsrv_descript *nd, struct nfssvc_sock *slp,
+	    int err, int cache, u_quad_t *frev, struct mbuf **mrq,
+	    struct mbuf **mbp, caddr_t *bposp)
 {
 	u_int32_t *tl;
 	struct mbuf *mreq;
@@ -1387,8 +1367,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
  * sure to set the r_retry field to 0 (implies nm_retry == 0).
  */
 void
-nfs_timer(arg)
-	void *arg;	/* never used */
+nfs_timer(void *arg /* never used */)
 {
 	struct nfsreq *rep;
 	struct mbuf *m;
@@ -1520,8 +1499,7 @@ nfs_timer(arg)
  * to terminate any outstanding RPCs.
  */
 int
-nfs_nmcancelreqs(nmp)
-	struct nfsmount *nmp;
+nfs_nmcancelreqs(struct nfsmount *nmp)
 {
 	struct nfsreq *req;
 	int i, s1, s2;
@@ -1561,8 +1539,7 @@ nfs_nmcancelreqs(nmp)
  */
 
 static void
-nfs_softterm(rep)
-	struct nfsreq *rep;
+nfs_softterm(struct nfsreq *rep)
 {
 	rep->r_flags |= R_SOFTTERM;
 
@@ -1650,8 +1627,7 @@ nfs_sndlock(struct nfsreq *rep)
  * Unlock the stream socket for others.
  */
 void
-nfs_sndunlock(rep)
-	struct nfsreq *rep;
+nfs_sndunlock(struct nfsreq *rep)
 {
 	int *statep = &rep->r_nmp->nm_state;
 
@@ -1667,8 +1643,7 @@ nfs_sndunlock(rep)
 }
 
 static int
-nfs_rcvlock(rep)
-	struct nfsreq *rep;
+nfs_rcvlock(struct nfsreq *rep)
 {
 	int *statep = &rep->r_nmp->nm_state;
 	int slpflag;
@@ -1732,8 +1707,7 @@ nfs_rcvlock(rep)
  * Unlock the stream socket for others.
  */
 static void
-nfs_rcvunlock(rep)
-	struct nfsreq *rep;
+nfs_rcvunlock(struct nfsreq *rep)
 {
 	int *statep = &rep->r_nmp->nm_state;
 
@@ -1765,9 +1739,7 @@ nfs_rcvunlock(rep)
  *	with TCP.  Use vfs.nfs.realign_count and realign_test to check this.
  */
 static void
-nfs_realign(pm, hsiz)
-	struct mbuf **pm;
-	int hsiz;
+nfs_realign(struct mbuf **pm, int hsiz)
 {
 	struct mbuf *m;
 	struct mbuf *n = NULL;
@@ -1811,10 +1783,7 @@ nfs_realign(pm, hsiz)
  * - fill in the cred struct.
  */
 int
-nfs_getreq(nd, nfsd, has_header)
-	struct nfsrv_descript *nd;
-	struct nfsd *nfsd;
-	int has_header;
+nfs_getreq(struct nfsrv_descript *nd, struct nfsd *nfsd, int has_header)
 {
 	int len, i;
 	u_int32_t *tl;
@@ -2082,10 +2051,7 @@ nfs_msg(struct thread *td, char *server, char *msg)
  * be called with M_WAIT from an nfsd.
  */
 void
-nfsrv_rcv(so, arg, waitflag)
-	struct socket *so;
-	void *arg;
-	int waitflag;
+nfsrv_rcv(struct socket *so, void *arg, int waitflag)
 {
 	struct nfssvc_sock *slp = (struct nfssvc_sock *)arg;
 	struct mbuf *m;
@@ -2200,9 +2166,7 @@ dorecs:
  * can sleep.
  */
 static int
-nfsrv_getstream(slp, waitflag)
-	struct nfssvc_sock *slp;
-	int waitflag;
+nfsrv_getstream(struct nfssvc_sock *slp, int waitflag)
 {
 	struct mbuf *m, **mpp;
 	char *cp1, *cp2;
@@ -2331,10 +2295,8 @@ nfsrv_getstream(slp, waitflag)
  * Parse an RPC header.
  */
 int
-nfsrv_dorec(slp, nfsd, ndp)
-	struct nfssvc_sock *slp;
-	struct nfsd *nfsd;
-	struct nfsrv_descript **ndp;
+nfsrv_dorec(struct nfssvc_sock *slp, struct nfsd *nfsd,
+	    struct nfsrv_descript **ndp)
 {
 	struct nfsrv_rec *rec;
 	struct mbuf *m;
@@ -2374,8 +2336,7 @@ nfsrv_dorec(slp, nfsd, ndp)
  * running nfsds will go look for the work in the nfssvc_sock list.
  */
 void
-nfsrv_wakenfsd(slp)
-	struct nfssvc_sock *slp;
+nfsrv_wakenfsd(struct nfssvc_sock *slp)
 {
 	struct nfsd *nd;
 
diff --git a/sys/vfs/nfs/nfs_srvcache.c b/sys/vfs/nfs/nfs_srvcache.c
index e62ee0e500..69f85f1675 100644
--- a/sys/vfs/nfs/nfs_srvcache.c
+++ b/sys/vfs/nfs/nfs_srvcache.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.21 2000/02/13 03:32:06 peter Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.5 2003/08/07 21:17:42 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.6 2004/04/19 16:33:49 cpressey Exp $
  */
 
 /*
@@ -133,7 +133,7 @@ static int nfsv2_repstat[NFS_NPROCS] = {
  * Initialize the server request cache list
  */
 void
-nfsrv_initcache()
+nfsrv_initcache(void)
 {
 
 	nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, &nfsrvhash);
@@ -155,10 +155,8 @@ nfsrv_initcache()
  * Update/add new request at end of lru list
  */
 int
-nfsrv_getcache(nd, slp, repp)
-	struct nfsrv_descript *nd;
-	struct nfssvc_sock *slp;
-	struct mbuf **repp;
+nfsrv_getcache(struct nfsrv_descript *nd, struct nfssvc_sock *slp,
+	       struct mbuf **repp)
 {
 	struct nfsrvcache *rp;
 	struct mbuf *mb;
@@ -270,10 +268,7 @@ loop:
  * Update a request cache entry after the rpc has been done
  */
 void
-nfsrv_updatecache(nd, repvalid, repmbuf)
-	struct nfsrv_descript *nd;
-	int repvalid;
-	struct mbuf *repmbuf;
+nfsrv_updatecache(struct nfsrv_descript *nd, int repvalid, struct mbuf *repmbuf)
 {
 	struct nfsrvcache *rp;
 
@@ -334,7 +329,7 @@ loop:
  * Clean out the cache. Called when the last nfsd terminates.
  */
 void
-nfsrv_cleancache()
+nfsrv_cleancache(void)
 {
 	struct nfsrvcache *rp, *nextrp;
 
diff --git a/sys/vfs/nfs/nfs_subs.c b/sys/vfs/nfs/nfs_subs.c
index ec77ba9ca4..c547913984 100644
--- a/sys/vfs/nfs/nfs_subs.c
+++ b/sys/vfs/nfs/nfs_subs.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
  * $FreeBSD: src/sys/nfs/nfs_subs.c,v 1.90.2.2 2001/10/25 19:18:53 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.13 2004/04/07 05:15:48 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.14 2004/04/19 16:33:49 cpressey Exp $
  */
 
 /*
@@ -564,7 +564,7 @@ LIST_HEAD(nfsnodehashhead, nfsnode);
 int nfs_webnamei (struct nameidata *, struct vnode *, struct proc *);
 
 u_quad_t
-nfs_curusec() 
+nfs_curusec(void) 
 {
 	struct timeval tv;
 	
@@ -578,11 +578,7 @@ nfs_curusec()
  * (just used to decide if a cluster is a good idea)
  */
 struct mbuf *
-nfsm_reqh(vp, procid, hsiz, bposp)
-	struct vnode *vp;
-	u_long procid;
-	int hsiz;
-	caddr_t *bposp;
+nfsm_reqh(struct vnode *vp, u_long procid, int hsiz, caddr_t *bposp)
 {
 	struct mbuf *mb;
 	u_int32_t *tl;
@@ -626,20 +622,10 @@ nfsm_reqh(vp, procid, hsiz, bposp)
  * Returns the head of the mbuf list.
  */
 struct mbuf *
-nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
-	verf_str, mrest, mrest_len, mbp, xidp)
-	struct ucred *cr;
-	int nmflag;
-	int procid;
-	int auth_type;
-	int auth_len;
-	char *auth_str;
-	int verf_len;
-	char *verf_str;
-	struct mbuf *mrest;
-	int mrest_len;
-	struct mbuf **mbp;
-	u_int32_t *xidp;
+nfsm_rpchead(struct ucred *cr, int nmflag, int procid, int auth_type,
+	     int auth_len, char *auth_str, int verf_len, char *verf_str,
+	     struct mbuf *mrest, int mrest_len, struct mbuf **mbp,
+	     u_int32_t *xidp)
 {
 	struct mbuf *mb;
 	u_int32_t *tl;
@@ -782,11 +768,7 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
  * copies mbuf chain to the uio scatter/gather list
  */
 int
-nfsm_mbuftouio(mrep, uiop, siz, dpos)
-	struct mbuf **mrep;
-	struct uio *uiop;
-	int siz;
-	caddr_t *dpos;
+nfsm_mbuftouio(struct mbuf **mrep, struct uio *uiop, int siz, caddr_t *dpos)
 {
 	char *mbufcp, *uiocp;
 	int xfer, left, len;
@@ -858,11 +840,7 @@ nfsm_mbuftouio(mrep, uiop, siz, dpos)
  * NOTE: can ony handle iovcnt == 1
  */
 int
-nfsm_uiotombuf(uiop, mq, siz, bpos)
-	struct uio *uiop;
-	struct mbuf **mq;
-	int siz;
-	caddr_t *bpos;
+nfsm_uiotombuf(struct uio *uiop, struct mbuf **mq, int siz, caddr_t *bpos)
 {
 	char *uiocp;
 	struct mbuf *mp, *mp2;
@@ -944,12 +922,7 @@ nfsm_uiotombuf(uiop, mq, siz, bpos)
  * cases. (The macros use the vars. dpos and dpos2)
  */
 int
-nfsm_disct(mdp, dposp, siz, left, cp2)
-	struct mbuf **mdp;
-	caddr_t *dposp;
-	int siz;
-	int left;
-	caddr_t *cp2;
+nfsm_disct(struct mbuf **mdp, caddr_t *dposp, int siz, int left, caddr_t *cp2)
 {
 	struct mbuf *mp, *mp2;
 	int siz2, xfer;
@@ -1007,11 +980,7 @@ nfsm_disct(mdp, dposp, siz, left, cp2)
  * Advance the position in the mbuf chain.
  */
 int
-nfs_adv(mdp, dposp, offs, left)
-	struct mbuf **mdp;
-	caddr_t *dposp;
-	int offs;
-	int left;
+nfs_adv(struct mbuf **mdp, caddr_t *dposp, int offs, int left)
 {
 	struct mbuf *m;
 	int s;
@@ -1034,11 +1003,7 @@ nfs_adv(mdp, dposp, offs, left)
  * Copy a string into mbufs for the hard cases...
  */
 int
-nfsm_strtmbuf(mb, bpos, cp, siz)
-	struct mbuf **mb;
-	char **bpos;
-	const char *cp;
-	long siz;
+nfsm_strtmbuf(struct mbuf **mb, char **bpos, const char *cp, long siz)
 {
 	struct mbuf *m1 = NULL, *m2;
 	long left, xfer, len, tlen;
@@ -1100,8 +1065,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz)
  * Called once to initialize data structures...
  */
 int
-nfs_init(vfsp)
-	struct vfsconf *vfsp;
+nfs_init(struct vfsconf *vfsp)
 {
 	int i;
 
@@ -1176,8 +1140,7 @@ nfs_init(vfsp)
 }
 
 int
-nfs_uninit(vfsp)
-	struct vfsconf *vfsp;
+nfs_uninit(struct vfsconf *vfsp)
 {
 
 	untimeout(nfs_timer, (void *)NULL, nfs_timer_handle);
@@ -1206,12 +1169,8 @@ nfs_uninit(vfsp)
  *    copy the attributes to *vaper
  */
 int
-nfs_loadattrcache(vpp, mdp, dposp, vaper, dontshrink)
-	struct vnode **vpp;
-	struct mbuf **mdp;
-	caddr_t *dposp;
-	struct vattr *vaper;
-	int dontshrink;
+nfs_loadattrcache(struct vnode **vpp, struct mbuf **mdp, caddr_t *dposp,
+		  struct vattr *vaper, int dontshrink)
 {
 	struct vnode *vp = *vpp;
 	struct vattr *vap;
@@ -1375,9 +1334,7 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, acdebug, CTLFLAG_RW, &nfs_acdebug, 0, "");
  * otherwise return an error
  */
 int
-nfs_getattrcache(vp, vaper)
-	struct vnode *vp;
-	struct vattr *vaper;
+nfs_getattrcache(struct vnode *vp, struct vattr *vaper)
 {
 	struct nfsnode *np;
 	struct vattr *vap;
@@ -1466,17 +1423,10 @@ nfs_getattrcache(vp, vaper)
  * released by the caller.
  */
 int
-nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, td, kerbflag, pubflag)
-	struct nameidata *ndp;
-	fhandle_t *fhp;
-	int len;
-	struct nfssvc_sock *slp;
-	struct sockaddr *nam;
-	struct mbuf **mdp;
-	caddr_t *dposp;
-	struct vnode **retdirp;
-	struct thread *td;
-	int kerbflag, pubflag;
+nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len,
+	  struct nfssvc_sock *slp, struct sockaddr *nam, struct mbuf **mdp,
+	  caddr_t *dposp, struct vnode **retdirp, struct thread *td,
+	  int kerbflag, int pubflag)
 {
 	int i, rem;
 	struct mbuf *md;
@@ -1747,10 +1697,7 @@ out:
  * boundary and only trims off the back end
  */
 void
-nfsm_adj(mp, len, nul)
-	struct mbuf *mp;
-	int len;
-	int nul;
+nfsm_adj(struct mbuf *mp, int len, int nul)
 {
 	struct mbuf *m;
 	int count, i;
@@ -1809,14 +1756,9 @@ nfsm_adj(mp, len, nul)
  * doesn't get too big...
  */
 void
-nfsm_srvwcc(nfsd, before_ret, before_vap, after_ret, after_vap, mbp, bposp)
-	struct nfsrv_descript *nfsd;
-	int before_ret;
-	struct vattr *before_vap;
-	int after_ret;
-	struct vattr *after_vap;
-	struct mbuf **mbp;
-	char **bposp;
+nfsm_srvwcc(struct nfsrv_descript *nfsd, int before_ret,
+	    struct vattr *before_vap, int after_ret, struct vattr *after_vap,
+	    struct mbuf **mbp, char **bposp)
 {
 	struct mbuf *mb = *mbp, *mb2;
 	char *bpos = *bposp;
@@ -1840,12 +1782,8 @@ nfsm_srvwcc(nfsd, before_ret, before_vap, after_ret, after_vap, mbp, bposp)
 }
 
 void
-nfsm_srvpostopattr(nfsd, after_ret, after_vap, mbp, bposp)
-	struct nfsrv_descript *nfsd;
-	int after_ret;
-	struct vattr *after_vap;
-	struct mbuf **mbp;
-	char **bposp;
+nfsm_srvpostopattr(struct nfsrv_descript *nfsd, int after_ret,
+		   struct vattr *after_vap, struct mbuf **mbp, char **bposp)
 {
 	struct mbuf *mb = *mbp, *mb2;
 	char *bpos = *bposp;
@@ -1866,10 +1804,8 @@ nfsm_srvpostopattr(nfsd, after_ret, after_vap, mbp, bposp)
 }
 
 void
-nfsm_srvfattr(nfsd, vap, fp)
-	struct nfsrv_descript *nfsd;
-	struct vattr *vap;
-	struct nfs_fattr *fp;
+nfsm_srvfattr(struct nfsrv_descript *nfsd, struct vattr *vap,
+	      struct nfs_fattr *fp)
 {
 
 	fp->fa_nlink = txdr_unsigned(vap->va_nlink);
@@ -1915,16 +1851,9 @@ nfsm_srvfattr(nfsd, vap, fp)
  *	- if not lockflag unlock it with VOP_UNLOCK()
  */
 int
-nfsrv_fhtovp(fhp, lockflag, vpp, cred, slp, nam, rdonlyp, kerbflag, pubflag)
-	fhandle_t *fhp;
-	int lockflag;
-	struct vnode **vpp;
-	struct ucred *cred;
-	struct nfssvc_sock *slp;
-	struct sockaddr *nam;
-	int *rdonlyp;
-	int kerbflag;
-	int pubflag;
+nfsrv_fhtovp(fhandle_t *fhp, int lockflag, struct vnode **vpp,
+	     struct ucred *cred, struct nfssvc_sock *slp, struct sockaddr *nam,
+	     int *rdonlyp, int kerbflag, int pubflag)
 {
 	struct thread *td = curthread; /* XXX */
 	struct mount *mp;
@@ -2001,8 +1930,7 @@ nfsrv_fhtovp(fhp, lockflag, vpp, cred, slp, nam, rdonlyp, kerbflag, pubflag)
  * transformed this to all zeroes in both cases, so check for it.
  */
 int
-nfs_ispublicfh(fhp)
-	fhandle_t *fhp;
+nfs_ispublicfh(fhandle_t *fhp)
 {
 	char *cp = (char *)fhp;
 	int i;
@@ -2022,10 +1950,7 @@ nfs_ispublicfh(fhp)
  * don't need to be saved to store "struct in_addr", which is only 4 bytes.
  */
 int
-netaddr_match(family, haddr, nam)
-	int family;
-	union nethostaddr *haddr;
-	struct sockaddr *nam;
+netaddr_match(int family, union nethostaddr *haddr, struct sockaddr *nam)
 {
 	struct sockaddr_in *inetaddr;
 
@@ -2048,10 +1973,7 @@ static nfsuint64 nfs_nullcookie = { { 0, 0 } };
  * logical byte offset given.
  */
 nfsuint64 *
-nfs_getcookie(np, off, add)
-	struct nfsnode *np;
-	off_t off;
-	int add;
+nfs_getcookie(struct nfsnode *np, off_t off, int add)
 {
 	struct nfsdmap *dp, *dp2;
 	int pos;
@@ -2106,8 +2028,7 @@ nfs_getcookie(np, off, add)
  * Done mainly to avoid the use of stale offset cookies.
  */
 void
-nfs_invaldir(vp)
-	struct vnode *vp;
+nfs_invaldir(struct vnode *vp)
 {
 	struct nfsnode *np = VTONFS(vp);
 
@@ -2133,8 +2054,7 @@ nfs_invaldir(vp)
  * writes are not clusterable.
  */
 void
-nfs_clearcommit(mp)
-	struct mount *mp;
+nfs_clearcommit(struct mount *mp)
 {
 	struct vnode *vp, *nvp;
 	struct buf *bp, *nbp;
@@ -2166,9 +2086,7 @@ nfs_clearcommit(mp)
  * numbers not specified for the associated procedure.
  */
 int
-nfsrv_errmap(nd, err)
-	struct nfsrv_descript *nd;
-	int err;
+nfsrv_errmap(struct nfsrv_descript *nd, int err)
 {
 	short *defaulterrp, *errp;
 
@@ -2206,9 +2124,7 @@ nfsrv_object_create(struct vnode *vp)
  *  that used to be here.)
  */
 void
-nfsrvw_sort(list, num)
-        gid_t *list;
-        int num;
+nfsrvw_sort(gid_t *list, int num)
 {
 	int i, j;
 	gid_t v;
@@ -2227,8 +2143,7 @@ nfsrvw_sort(list, num)
  * copy credentials making sure that the result can be compared with bcmp().
  */
 void
-nfsrv_setcred(incred, outcred)
-	struct ucred *incred, *outcred;
+nfsrv_setcred(struct ucred *incred, struct ucred *outcred)
 {
 	int i;
 
diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c
index b28f105d05..b2ae097b3a 100644
--- a/sys/vfs/nfs/nfs_syscalls.c
+++ b/sys/vfs/nfs/nfs_syscalls.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
  * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.14 2004/03/09 02:52:10 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.15 2004/04/19 16:33:49 cpressey Exp $
  */
 
 #include <sys/param.h>
@@ -722,8 +722,7 @@ done:
  * reassigned during cleanup.
  */
 static void
-nfsrv_zapsock(slp)
-	struct nfssvc_sock *slp;
+nfsrv_zapsock(struct nfssvc_sock *slp)
 {
 	struct nfsuid *nuidp, *nnuidp;
 	struct nfsrv_descript *nwp, *nnwp;
@@ -777,8 +776,7 @@ nfsrv_zapsock(slp)
  * is no longer valid, you can throw it away.
  */
 void
-nfsrv_slpderef(slp)
-	struct nfssvc_sock *slp;
+nfsrv_slpderef(struct nfssvc_sock *slp)
 {
 	if (--(slp->ns_sref) == 0 && (slp->ns_flag & SLP_VALID) == 0) {
 		TAILQ_REMOVE(&nfssvc_sockhead, slp, ns_chain);
@@ -790,9 +788,7 @@ nfsrv_slpderef(slp)
  * Lock a socket against others.
  */
 int
-nfs_slplock(slp, wait)
-	struct nfssvc_sock *slp;
-	int wait;
+nfs_slplock(struct nfssvc_sock *slp, int wait)
 {
 	int *statep = &slp->ns_solock;
 
@@ -810,8 +806,7 @@ nfs_slplock(slp, wait)
  * Unlock the stream socket for others.
  */
 void
-nfs_slpunlock(slp)
-	struct nfssvc_sock *slp;
+nfs_slpunlock(struct nfssvc_sock *slp)
 {
 	int *statep = &slp->ns_solock;
 
@@ -830,8 +825,7 @@ nfs_slpunlock(slp)
  * corruption.
  */
 void
-nfsrv_init(terminating)
-	int terminating;
+nfsrv_init(int terminating)
 {
 	struct nfssvc_sock *slp, *nslp;
 
@@ -881,10 +875,7 @@ nfsrv_init(terminating)
  * Add entries to the server monitor log.
  */
 static void
-nfsd_rt(sotype, nd, cacherep)
-	int sotype;
-	struct nfsrv_descript *nd;
-	int cacherep;
+nfsd_rt(int sotype, struct nfsrv_descript *nd, int cacherep)
 {
 	struct drt *rt;
 
@@ -995,15 +986,9 @@ nfssvc_iod(struct thread *td)
  * on this mount point porpous out of the kernel and do it.
  */
 int
-nfs_getauth(nmp, rep, cred, auth_str, auth_len, verf_str, verf_len, key)
-	struct nfsmount *nmp;
-	struct nfsreq *rep;
-	struct ucred *cred;
-	char **auth_str;
-	int *auth_len;
-	char *verf_str;
-	int *verf_len;
-	NFSKERBKEY_T key;		/* return session key */
+nfs_getauth(struct nfsmount *nmp, struct nfsreq *rep,
+	    struct ucred *cred, char **auth_str, int *auth_len, char *verf_str,
+	    int *verf_len, NFSKERBKEY_T key /* return session key */)
 {
 	int error = 0;
 
@@ -1057,13 +1042,8 @@ nfs_getauth(nmp, rep, cred, auth_str, auth_len, verf_str, verf_len, key)
  * Get a nickname authenticator and verifier.
  */
 int
-nfs_getnickauth(nmp, cred, auth_str, auth_len, verf_str, verf_len)
-	struct nfsmount *nmp;
-	struct ucred *cred;
-	char **auth_str;
-	int *auth_len;
-	char *verf_str;
-	int verf_len;
+nfs_getnickauth(struct nfsmount *nmp, struct ucred *cred, char **auth_str,
+		int *auth_len, char *verf_str, int verf_len)
 {
 	struct nfsuid *nuidp;
 	u_int32_t *nickp, *verfp;
@@ -1125,14 +1105,9 @@ nfs_getnickauth(nmp, cred, auth_str, auth_len, verf_str, verf_len)
  * Save the current nickname in a hash list entry on the mount point.
  */
 int
-nfs_savenickauth(nmp, cred, len, key, mdp, dposp, mrep)
-	struct nfsmount *nmp;
-	struct ucred *cred;
-	int len;
-	NFSKERBKEY_T key;
-	struct mbuf **mdp;
-	char **dposp;
-	struct mbuf *mrep;
+nfs_savenickauth(struct nfsmount *nmp, struct ucred *cred, int len,
+		 NFSKERBKEY_T key, struct mbuf **mdp, char **dposp,
+		 struct mbuf *mrep)
 {
 	struct nfsuid *nuidp;
 	u_int32_t *tl;
diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c
index 568390c941..71ed66ac99 100644
--- a/sys/vfs/nfs/nfs_vnops.c
+++ b/sys/vfs/nfs/nfs_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
  * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $
- * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.20 2004/04/08 22:32:14 dillon Exp $
+ * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.21 2004/04/19 16:33:49 cpressey Exp $
  */
 
 
@@ -280,7 +280,7 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, access_cache_misses, CTLFLAG_RD,
 			 | NFSV3ACCESS_DELETE | NFSV3ACCESS_LOOKUP)
 static int
 nfs3_access_otw(struct vnode *vp, int wmode,
-	struct thread *td, struct ucred *cred)
+		struct thread *td, struct ucred *cred)
 {
 	const int v3 = 1;
 	u_int32_t *tl;
@@ -317,15 +317,12 @@ nfsmout:
  * For nfs version 2, just return ok. File accesses may fail later.
  * For nfs version 3, use the access rpc to check accessibility. If file modes
  * are changed on the server, accesses might still fail later.
+ *
+ * nfs_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	      struct thread *a_td)
  */
 static int
-nfs_access(ap)
-	struct vop_access_args /* {
-		struct vnode *a_vp;
-		int  a_mode;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_access(struct vop_access_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	int error = 0;
@@ -473,16 +470,13 @@ nfs_access(ap)
  * and that deletion is not in progress.
  * For paged in text files, you will need to flush the page cache
  * if consistency is lost.
+ *
+ * nfs_open(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *	    struct thread *a_td)
  */
 /* ARGSUSED */
 static int
-nfs_open(ap)
-	struct vop_open_args /* {
-		struct vnode *a_vp;
-		int  a_mode;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_open(struct vop_open_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -577,17 +571,13 @@ nfs_open(ap)
  * for NQNFS         - do nothing now, since 2 is dealt with via leases and
  *                     1 should be dealt with via an fsync() system call for
  *                     cases where write errors are important.
+ *
+ * nfs_close(struct vnodeop_desc *a_desc, struct vnode *a_vp, int a_fflag,
+ *	     struct ucred *a_cred, struct thread *a_td)
  */
 /* ARGSUSED */
 static int
-nfs_close(ap)
-	struct vop_close_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode *a_vp;
-		int  a_fflag;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_close(struct vop_close_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -628,15 +618,12 @@ nfs_close(ap)
 
 /*
  * nfs getattr call from vfs.
+ *
+ * nfs_getattr(struct vnode *a_vp, struct vattr *a_vap, struct ucred *a_cred,
+ *		struct thread *a_td)
  */
 static int
-nfs_getattr(ap)
-	struct vop_getattr_args /* {
-		struct vnode *a_vp;
-		struct vattr *a_vap;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_getattr(struct vop_getattr_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -680,16 +667,13 @@ nfsmout:
 
 /*
  * nfs setattr call.
+ *
+ * nfs_setattr(struct vnodeop_desc *a_desc, struct vnode *a_vp,
+ *		struct vattr *a_vap, struct ucred *a_cred,
+ *		struct thread *a_td)
  */
 static int
-nfs_setattr(ap)
-	struct vop_setattr_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode *a_vp;
-		struct vattr *a_vap;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_setattr(struct vop_setattr_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -785,7 +769,7 @@ nfs_setattr(ap)
  */
 static int
 nfs_setattrrpc(struct vnode *vp, struct vattr *vap,
-	struct ucred *cred, struct thread *td)
+	       struct ucred *cred, struct thread *td)
 {
 	struct nfsv2_sattr *sp;
 	caddr_t cp;
@@ -833,15 +817,12 @@ nfsmout:
 
 /*
  * 'cached' nfs directory lookup
+ *
+ * nfs_lookup(struct vnodeop_desc *a_desc, struct vnode *a_dvp,
+ *	      struct vnode **a_vpp, struct componentname *a_cnp)
  */
 static int
-nfs_lookup(ap)
-	struct vop_lookup_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-	} */ *ap;
+nfs_lookup(struct vop_lookup_args *ap)
 {
 	struct componentname *cnp = ap->a_cnp;
 	struct vnode *dvp = ap->a_dvp;
@@ -1066,15 +1047,12 @@ nfsmout:
 /*
  * nfs read call.
  * Just call nfs_bioread() to do the work.
+ *
+ * nfs_read(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *	    struct ucred *a_cred)
  */
 static int
-nfs_read(ap)
-	struct vop_read_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfs_read(struct vop_read_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 
@@ -1091,14 +1069,11 @@ nfs_read(ap)
 
 /*
  * nfs readlink call
+ *
+ * nfs_readlink(struct vnode *a_vp, struct uio *a_uio, struct ucred *a_cred)
  */
 static int
-nfs_readlink(ap)
-	struct vop_readlink_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		struct ucred *a_cred;
-	} */ *ap;
+nfs_readlink(struct vop_readlink_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 
@@ -1210,10 +1185,7 @@ nfsmout:
  * nfs write call
  */
 int
-nfs_writerpc(vp, uiop, iomode, must_commit)
-	struct vnode *vp;
-	struct uio *uiop;
-	int *iomode, *must_commit;
+nfs_writerpc(struct vnode *vp, struct uio *uiop, int *iomode, int *must_commit)
 {
 	u_int32_t *tl;
 	caddr_t cp;
@@ -1324,11 +1296,8 @@ nfsmout:
  * mode set to specify the file type and the size field for rdev.
  */
 static int
-nfs_mknodrpc(dvp, vpp, cnp, vap)
-	struct vnode *dvp;
-	struct vnode **vpp;
-	struct componentname *cnp;
-	struct vattr *vap;
+nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp,
+	     struct vattr *vap)
 {
 	struct nfsv2_sattr *sp;
 	u_int32_t *tl;
@@ -1412,16 +1381,13 @@ nfsmout:
 /*
  * nfs mknod vop
  * just call nfs_mknodrpc() to do the work.
+ *
+ * nfs_mknod(struct vnode *a_dvp, struct vnode **a_vpp,
+ *	     struct componentname *a_cnp, struct vattr *a_vap)
  */
 /* ARGSUSED */
 static int
-nfs_mknod(ap)
-	struct vop_mknod_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
+nfs_mknod(struct vop_mknod_args *ap)
 {
 	return nfs_mknodrpc(ap->a_dvp, ap->a_vpp, ap->a_cnp, ap->a_vap);
 }
@@ -1429,15 +1395,12 @@ nfs_mknod(ap)
 static u_long create_verf;
 /*
  * nfs file create call
+ *
+ * nfs_create(struct vnode *a_dvp, struct vnode **a_vpp,
+ *	      struct componentname *a_cnp, struct vattr *a_vap)
  */
 static int
-nfs_create(ap)
-	struct vop_create_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
+nfs_create(struct vop_create_args *ap)
 {
 	struct vnode *dvp = ap->a_dvp;
 	struct vattr *vap = ap->a_vap;
@@ -1567,15 +1530,12 @@ nfsmout:
  *	     call nfs_sillyrename() to set it up
  *     else
  *	  do the remove rpc
+ *
+ * nfs_remove(struct vnodeop_desc *a_desc, struct vnode *a_dvp,
+ *	      struct vnode *a_vp, struct componentname *a_cnp)
  */
 static int
-nfs_remove(ap)
-	struct vop_remove_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode * a_dvp;
-		struct vnode * a_vp;
-		struct componentname * a_cnp;
-	} */ *ap;
+nfs_remove(struct vop_remove_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vnode *dvp = ap->a_dvp;
@@ -1632,7 +1592,6 @@ nfs_remove(ap)
 int
 nfs_removeit(struct sillyrename *sp)
 {
-
 	return (nfs_removerpc(sp->s_dvp, sp->s_name, sp->s_namlen,
 		sp->s_cred, NULL));
 }
@@ -1641,12 +1600,8 @@ nfs_removeit(struct sillyrename *sp)
  * Nfs remove rpc, called from nfs_remove() and nfs_removeit().
  */
 static int
-nfs_removerpc(dvp, name, namelen, cred, td)
-	struct vnode *dvp;
-	const char *name;
-	int namelen;
-	struct ucred *cred;
-	struct thread *td;
+nfs_removerpc(struct vnode *dvp, const char *name, int namelen,
+	      struct ucred *cred, struct thread *td)
 {
 	u_int32_t *tl;
 	caddr_t cp;
@@ -1674,17 +1629,13 @@ nfsmout:
 
 /*
  * nfs file rename call
+ *
+ * nfs_rename(struct vnode *a_fdvp, struct vnode *a_fvp,
+ *	      struct componentname *a_fcnp, struct vnode *a_tdvp,
+ *	      struct vnode *a_tvp, struct componentname *a_tcnp)
  */
 static int
-nfs_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;
+nfs_rename(struct vop_rename_args *ap)
 {
 	struct vnode *fvp = ap->a_fvp;
 	struct vnode *tvp = ap->a_tvp;
@@ -1761,10 +1712,8 @@ out:
  * nfs file rename rpc called from nfs_remove() above
  */
 static int
-nfs_renameit(sdvp, scnp, sp)
-	struct vnode *sdvp;
-	struct componentname *scnp;
-	struct sillyrename *sp;
+nfs_renameit(struct vnode *sdvp, struct componentname *scnp,
+	     struct sillyrename *sp)
 {
 	return (nfs_renamerpc(sdvp, scnp->cn_nameptr, scnp->cn_namelen,
 		sdvp, sp->s_name, sp->s_namlen, scnp->cn_cred, scnp->cn_td));
@@ -1774,15 +1723,9 @@ nfs_renameit(sdvp, scnp, sp)
  * Do an nfs rename rpc. Called from nfs_rename() and nfs_renameit().
  */
 static int
-nfs_renamerpc(fdvp, fnameptr, fnamelen, tdvp, tnameptr, tnamelen, cred, td)
-	struct vnode *fdvp;
-	const char *fnameptr;
-	int fnamelen;
-	struct vnode *tdvp;
-	const char *tnameptr;
-	int tnamelen;
-	struct ucred *cred;
-	struct thread *td;
+nfs_renamerpc(struct vnode *fdvp, const char *fnameptr, int fnamelen,
+	      struct vnode *tdvp, const char *tnameptr, int tnamelen,
+	      struct ucred *cred, struct thread *td)
 {
 	u_int32_t *tl;
 	caddr_t cp;
@@ -1818,14 +1761,12 @@ nfsmout:
 
 /*
  * nfs hard link create call
+ *
+ * nfs_link(struct vnode *a_tdvp, struct vnode *a_vp,
+ *	    struct componentname *a_cnp)
  */
 static int
-nfs_link(ap)
-	struct vop_link_args /* {
-		struct vnode *a_tdvp;
-		struct vnode *a_vp;
-		struct componentname *a_cnp;
-	} */ *ap;
+nfs_link(struct vop_link_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vnode *tdvp = ap->a_tdvp;
@@ -1878,16 +1819,13 @@ nfsmout:
 
 /*
  * nfs symbolic link create call
+ *
+ * nfs_symlink(struct vnode *a_dvp, struct vnode **a_vpp,
+ *		struct componentname *a_cnp, struct vattr *a_vap,
+ *		char *a_target)
  */
 static int
-nfs_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;
+nfs_symlink(struct vop_symlink_args *ap)
 {
 	struct vnode *dvp = ap->a_dvp;
 	struct vattr *vap = ap->a_vap;
@@ -1978,15 +1916,12 @@ nfsmout:
 
 /*
  * nfs make dir call
+ *
+ * nfs_mkdir(struct vnode *a_dvp, struct vnode **a_vpp,
+ *	     struct componentname *a_cnp, struct vattr *a_vap)
  */
 static int
-nfs_mkdir(ap)
-	struct vop_mkdir_args /* {
-		struct vnode *a_dvp;
-		struct vnode **a_vpp;
-		struct componentname *a_cnp;
-		struct vattr *a_vap;
-	} */ *ap;
+nfs_mkdir(struct vop_mkdir_args *ap)
 {
 	struct vnode *dvp = ap->a_dvp;
 	struct vattr *vap = ap->a_vap;
@@ -2062,14 +1997,12 @@ nfsmout:
 
 /*
  * nfs remove directory call
+ *
+ * nfs_rmdir(struct vnode *a_dvp, struct vnode *a_vp,
+ *	     struct componentname *a_cnp)
  */
 static int
-nfs_rmdir(ap)
-	struct vop_rmdir_args /* {
-		struct vnode *a_dvp;
-		struct vnode *a_vp;
-		struct componentname *a_cnp;
-	} */ *ap;
+nfs_rmdir(struct vop_rmdir_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vnode *dvp = ap->a_dvp;
@@ -2109,14 +2042,11 @@ nfsmout:
 
 /*
  * nfs readdir call
+ *
+ * nfs_readdir(struct vnode *a_vp, struct uio *a_uio, struct ucred *a_cred)
  */
 static int
-nfs_readdir(ap)
-	struct vop_readdir_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		struct ucred *a_cred;
-	} */ *ap;
+nfs_readdir(struct vop_readdir_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -2576,9 +2506,7 @@ nfsmout:
  * nfs_rename() completes, but...
  */
 static int
-nfs_sillyrename(dvp, vp, cnp)
-	struct vnode *dvp, *vp;
-	struct componentname *cnp;
+nfs_sillyrename(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
 {
 	struct sillyrename *sp;
 	struct nfsnode *np;
@@ -2631,13 +2559,8 @@ bad:
  * *npp != NULL --> update the file handle in the vnode
  */
 static int
-nfs_lookitup(dvp, name, len, cred, td, npp)
-	struct vnode *dvp;
-	const char *name;
-	int len;
-	struct ucred *cred;
-	struct thread *td;
-	struct nfsnode **npp;
+nfs_lookitup(struct vnode *dvp, const char *name, int len, struct ucred *cred,
+	     struct thread *td, struct nfsnode **npp)
 {
 	u_int32_t *tl;
 	caddr_t cp;
@@ -2755,17 +2678,12 @@ nfsmout:
  *    Kernel Write might not be enabled and also figured copyout() would do
  *    a lot more work than bcopy() and also it currently happens in the
  *    context of the swapper process (2).
+ *
+ * nfs_bmap(struct vnode *a_vp, daddr_t a_bn, struct vnode **a_vpp,
+ *	    daddr_t *a_bnp, int *a_runp, int *a_runb)
  */
 static int
-nfs_bmap(ap)
-	struct vop_bmap_args /* {
-		struct vnode *a_vp;
-		daddr_t  a_bn;
-		struct vnode **a_vpp;
-		daddr_t *a_bnp;
-		int *a_runp;
-		int *a_runb;
-	} */ *ap;
+nfs_bmap(struct vop_bmap_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 
@@ -2787,8 +2705,7 @@ nfs_bmap(ap)
  * request.
  */
 static int
-nfs_strategy(ap)
-	struct vop_strategy_args *ap;
+nfs_strategy(struct vop_strategy_args *ap)
 {
 	struct buf *bp = ap->a_bp;
 	struct thread *td;
@@ -2820,36 +2737,27 @@ nfs_strategy(ap)
  * Mmap a file
  *
  * NB Currently unsupported.
+ *
+ * nfs_mmap(struct vnode *a_vp, int a_fflags, struct ucred *a_cred,
+ *	    struct thread *a_td)
  */
 /* ARGSUSED */
 static int
-nfs_mmap(ap)
-	struct vop_mmap_args /* {
-		struct vnode *a_vp;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfs_mmap(struct vop_mmap_args *ap)
 {
-
 	return (EINVAL);
 }
 
 /*
  * fsync vnode op. Just call nfs_flush() with commit == 1.
+ *
+ * nfs_fsync(struct vnodeop_desc *a_desc, struct vnode *a_vp,
+ *	     struct ucred * a_cred, int a_waitfor, struct thread *a_td)
  */
 /* ARGSUSED */
 static int
-nfs_fsync(ap)
-	struct vop_fsync_args /* {
-		struct vnodeop_desc *a_desc;
-		struct vnode * a_vp;
-		struct ucred * a_cred;
-		int  a_waitfor;
-		struct thread * a_td;
-	} */ *ap;
+nfs_fsync(struct vop_fsync_args *ap)
 {
-
 	return (nfs_flush(ap->a_vp, ap->a_waitfor, ap->a_td, 1));
 }
 
@@ -2859,11 +2767,7 @@ nfs_fsync(ap)
  *	associated with the vnode.
  */
 static int
-nfs_flush(vp, waitfor, td, commit)
-	struct vnode *vp;
-	int waitfor;
-	struct thread *td;
-	int commit;
+nfs_flush(struct vnode *vp, int waitfor, struct thread *td, int commit)
 {
 	struct nfsnode *np = VTONFS(vp);
 	struct buf *bp;
@@ -3098,16 +3002,12 @@ done:
 /*
  * NFS advisory byte-level locks.
  * Currently unsupported.
+ *
+ * nfs_advlock(struct vnode *a_vp, caddr_t a_id, int a_op, struct flock *a_fl,
+ *		int a_flags)
  */
 static int
-nfs_advlock(ap)
-	struct vop_advlock_args /* {
-		struct vnode *a_vp;
-		caddr_t  a_id;
-		int  a_op;
-		struct flock *a_fl;
-		int  a_flags;
-	} */ *ap;
+nfs_advlock(struct vop_advlock_args *ap)
 {
 	struct nfsnode *np = VTONFS(ap->a_vp);
 
@@ -3121,12 +3021,11 @@ nfs_advlock(ap)
 
 /*
  * Print out the contents of an nfsnode.
+ *
+ * nfs_print(struct vnode *a_vp)
  */
 static int
-nfs_print(ap)
-	struct vop_print_args /* {
-		struct vnode *a_vp;
-	} */ *ap;
+nfs_print(struct vop_print_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -3143,12 +3042,11 @@ nfs_print(ap)
  * Just call nfs_writebp() with the force argument set to 1.
  *
  * NOTE: B_DONE may or may not be set in a_bp on call.
+ *
+ * nfs_bwrite(struct vnode *a_bp)
  */
 static int
-nfs_bwrite(ap)
-	struct vop_bwrite_args /* {
-		struct vnode *a_bp;
-	} */ *ap;
+nfs_bwrite(struct vop_bwrite_args *ap)
 {
 	return (nfs_writebp(ap->a_bp, 1, curthread));
 }
@@ -3159,10 +3057,7 @@ nfs_bwrite(ap)
  * B_CACHE if this is a VMIO buffer.
  */
 int
-nfs_writebp(bp, force, td)
-	struct buf *bp;
-	int force;
-	struct thread *td;
+nfs_writebp(struct buf *bp, int force, struct thread *td)
 {
 	int s;
 	int oldflags = bp->b_flags;
@@ -3223,15 +3118,12 @@ nfs_writebp(bp, force, td)
  * nfs special file access vnode op.
  * Essentially just get vattr and then imitate iaccess() since the device is
  * local to the client.
+ *
+ * nfsspec_access(struct vnode *a_vp, int a_mode, struct ucred *a_cred,
+ *		  struct thread *a_td)
  */
 static int
-nfsspec_access(ap)
-	struct vop_access_args /* {
-		struct vnode *a_vp;
-		int  a_mode;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfsspec_access(struct vop_access_args *ap)
 {
 	struct vattr *vap;
 	gid_t *gp;
@@ -3288,15 +3180,12 @@ found:
 
 /*
  * Read wrapper for special devices.
+ *
+ * nfsspec_read(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *		struct ucred *a_cred)
  */
 static int
-nfsspec_read(ap)
-	struct vop_read_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfsspec_read(struct vop_read_args *ap)
 {
 	struct nfsnode *np = VTONFS(ap->a_vp);
 
@@ -3310,15 +3199,12 @@ nfsspec_read(ap)
 
 /*
  * Write wrapper for special devices.
+ *
+ * nfsspec_write(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *		 struct ucred *a_cred)
  */
 static int
-nfsspec_write(ap)
-	struct vop_write_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfsspec_write(struct vop_write_args *ap)
 {
 	struct nfsnode *np = VTONFS(ap->a_vp);
 
@@ -3334,15 +3220,12 @@ nfsspec_write(ap)
  * Close wrapper for special devices.
  *
  * Update the times on the nfsnode then do device close.
+ *
+ * nfsspec_close(struct vnode *a_vp, int a_fflag, struct ucred *a_cred,
+ *		 struct thread *a_td)
  */
 static int
-nfsspec_close(ap)
-	struct vop_close_args /* {
-		struct vnode *a_vp;
-		int  a_fflag;
-		struct ucred *a_cred;
-		struct thread *a_td;
-	} */ *ap;
+nfsspec_close(struct vop_close_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
@@ -3365,15 +3248,12 @@ nfsspec_close(ap)
 
 /*
  * Read wrapper for fifos.
+ *
+ * nfsfifo_read(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *		struct ucred *a_cred)
  */
 static int
-nfsfifo_read(ap)
-	struct vop_read_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfsfifo_read(struct vop_read_args *ap)
 {
 	struct nfsnode *np = VTONFS(ap->a_vp);
 
@@ -3387,15 +3267,12 @@ nfsfifo_read(ap)
 
 /*
  * Write wrapper for fifos.
+ *
+ * nfsfifo_write(struct vnode *a_vp, struct uio *a_uio, int a_ioflag,
+ *		 struct ucred *a_cred)
  */
 static int
-nfsfifo_write(ap)
-	struct vop_write_args /* {
-		struct vnode *a_vp;
-		struct uio *a_uio;
-		int  a_ioflag;
-		struct ucred *a_cred;
-	} */ *ap;
+nfsfifo_write(struct vop_write_args *ap)
 {
 	struct nfsnode *np = VTONFS(ap->a_vp);
 
@@ -3411,14 +3288,11 @@ nfsfifo_write(ap)
  * Close wrapper for fifos.
  *
  * Update the times on the nfsnode then do fifo close.
+ *
+ * nfsfifo_close(struct vnode *a_vp, int a_fflag, struct thread *a_td)
  */
 static int
-nfsfifo_close(ap)
-	struct vop_close_args /* {
-		struct vnode *a_vp;
-		int  a_fflag;
-		struct thread *a_td;
-	} */ *ap;
+nfsfifo_close(struct vop_close_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct nfsnode *np = VTONFS(vp);
-- 
2.41.0