Cleanup and split of nfs client and server code.

This builds on the top of several repo-copies.

1 files changed, 120 insertions, 410 deletions

diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index da808f4..93e56eb 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -37,8 +37,8 @@
  * $FreeBSD$
  */
 
-#ifndef _NFS_NFS_H_
-#define _NFS_NFS_H_
+#ifndef _NFSSERVER_NFS_H_
+#define _NFSSERVER_NFS_H_
 
 #ifdef _KERNEL
 #include "opt_nfs.h"
@@ -48,41 +48,16 @@
  * Tunable constants for nfs
  */
 
-#define	NFS_MAXIOVEC	34
 #define NFS_TICKINTVL	5		/* Desired time for a tick (msec) */
 #define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
 #define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
 #define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
 #define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
 #define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFS_MAXWINDOW	1024		/* Max number of outstanding requests */
-#define	NFS_RETRANS	10		/* Num of retrans for soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 3		/* VREG attrib cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#ifndef NFS_MINDIRATTRTIMO
-#define	NFS_MINDIRATTRTIMO 30		/* VDIR attrib cache timeout in sec */
-#endif
-#ifndef NFS_MAXDIRATTRTIMO
-#define	NFS_MAXDIRATTRTIMO 60
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
 #define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#define	NFS_MAXASYNCDAEMON 	20	/* Max. number async_daemons runnable */
-#define NFS_MAXGATHERDELAY	100	/* Max. write gather delay (msec) */
 #ifndef NFS_GATHERDELAY
 #define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
 #endif
-#define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
 #ifdef _KERNEL
 #define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
 #endif
@@ -90,10 +65,6 @@
 /*
  * Oddballs
  */
-#define	NMOD(a)		((a) % nfs_asyncdaemons)
-#define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
-#define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
 #define NFS_SRVMAXDATA(n) \
 		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
 		 NFS_MAXDGRAMDATA : NFS_MAXDATA) : NFS_V2MAXDATA)
@@ -113,75 +84,10 @@
 #define IO_METASYNC	0
 #endif
 
-/*
- * Arguments to mount NFS
- */
-#define NFS_ARGSVERSION	3		/* change when nfs_args changes */
-struct nfs_args {
-	int		version;	/* args structure version number */
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-	int		acregmin;	/* cache attrs for reg files min time */
-	int		acregmax;	/* cache attrs for reg files max time */
-	int		acdirmin;	/* cache attrs for dirs min time */
-	int		acdirmax;	/* cache attrs for dirs max time */
-};
 
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retries */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-#define	NFSMNT_NQNFS		0x00000100  /* Use Nqnfs protocol */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use Kerberos authentication */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_LEASETERM	0x00001000  /* set lease term (nqnfs) */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define	NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define	NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_ACREGMIN		0x00040000
-#define	NFSMNT_ACREGMAX		0x00080000
-#define	NFSMNT_ACDIRMIN		0x00100000
-#define	NFSMNT_ACDIRMAX		0x00200000
-
-#define NFSSTA_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSSTA_GOTPATHCONF	0x00080000  /* Got the V3 pathconf info */
-#define NFSSTA_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSSTA_MNTD		0x00200000  /* Mnt server for mnt point */
-#define	NFSSTA_DISMINPROG	0x00400000  /* Dismount in progress */
-#define	NFSSTA_DISMNT		0x00800000  /* Dismounted */
-#define	NFSSTA_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSSTA_WANTSND		0x02000000  /* Want above */
-#define	NFSSTA_RCVLOCK		0x04000000  /* Rcv socket lock */
-#define	NFSSTA_WANTRCV		0x08000000  /* Want above */
-#define	NFSSTA_WAITAUTH		0x10000000  /* Wait for authentication */
-#define	NFSSTA_HASAUTH		0x20000000  /* Has authenticator */
-#define	NFSSTA_WANTAUTH		0x40000000  /* Wants an authenticator */
-#define	NFSSTA_AUTHERR		0x80000000  /* Authentication error */
+/* NFS state flags XXX -Wunused */
+#define	NFSRV_SNDLOCK		0x01000000  /* Send socket lock */
+#define	NFSRV_WANTSND		0x02000000  /* Want above */
 
 /*
  * Structures for the nfssvc(2) syscall. Not that anyone but nfsd and mount_nfs
@@ -204,7 +110,6 @@ struct nfsd_srvargs {
 	u_char		*nsd_verfstr;
 	struct timeval	nsd_timestamp;	/* timestamp from verifier */
 	u_int32_t	nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
 };
 
 struct nfsd_cargs {
@@ -215,180 +120,69 @@ struct nfsd_cargs {
 	u_char		*ncd_authstr;	/* Authenticator string */
 	u_int		ncd_verflen;	/* and the verifier */
 	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
 };
 
 /*
  * XXX to allow amd to include nfs.h without nfsproto.h
  */
 #ifdef NFS_NPROCS
-/*
- * Stats structure
- */
-struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFS_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFS_NPROCS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvnqnfs_leases;
-	int	srvnqnfs_maxleases;
-	int	srvnqnfs_getleases;
-	int	srvvop_writes;
-	int	accesscache_hits;
-	int	accesscache_misses;
-};
+#include <nfsserver/nfsrvstats.h>
 #endif
 
 /*
  * Flags for nfssvc() system call.
  */
-#define	NFSSVC_BIOD	0x002
 #define	NFSSVC_NFSD	0x004
 #define	NFSSVC_ADDSOCK	0x008
-#define	NFSSVC_AUTHIN	0x010
-#define	NFSSVC_GOTAUTH	0x040
-#define	NFSSVC_AUTHINFAIL 0x080
-#define	NFSSVC_MNTD	0x100
-#define	NFSSVC_LOCKDANS 0x200
 
 /*
- * fs.nfs sysctl(3) identifiers
+ * vfs.nfsrv sysctl(3) identifiers
  */
-#define NFS_NFSSTATS	1		/* struct: struct nfsstats */
+#define NFS_NFSRVSTATS	1		/* struct: struct nfsrvstats */
 #define NFS_NFSPRIVPORT	2		/* int: prohibit nfs to resvports */
 
-#define FS_NFS_NAMES { \
-		       { 0, 0 }, \
-		       { "nfsstats", CTLTYPE_STRUCT }, \
-		       { "nfsprivport", CTLTYPE_INT }, \
-}
-
 #ifdef _KERNEL
 
 #ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NFSREQ);
-MALLOC_DECLARE(M_NFSDIROFF);
 MALLOC_DECLARE(M_NFSRVDESC);
-MALLOC_DECLARE(M_NFSUID);
-MALLOC_DECLARE(M_NQLEASE);
 MALLOC_DECLARE(M_NFSD);
-MALLOC_DECLARE(M_NFSBIGFH);
-MALLOC_DECLARE(M_NFSHASH);
 #endif
 
-#ifdef ZONE_INTERRUPT
-extern vm_zone_t nfsmount_zone;
-#endif
+/* Forward declarations */
+struct nfssvc_sock;
+struct nfsrv_descript;
+struct uio;
+struct vattr;
+struct nameidata;
 
-extern struct callout_handle nfs_timer_handle;
+extern struct callout_handle nfsrv_timer_handle;
+extern struct nfsrvstats nfsrvstats;
 
-struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
+extern int	nfs_ticks;
+extern int	nfsrvw_procrastinate;
+extern int	nfsrvw_procrastinate_v3;
 
-/*
- * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
- * What should be in this set is open to debate, but I believe that since
- * I/O system calls on ufs are never interrupted by signals the set should
- * be minimal. My reasoning is that many current programs that use signals
- * such as SIGALRM will not expect file I/O system calls to be interrupted
- * by them and break.
- */
-#define	NFSINT_SIGMASK(set) 						\
-	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\
-	 SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) ||	\
-	 SIGISMEMBER(set, SIGQUIT))
-
-/*
- * Socket errors ignored for connectionless sockets??
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) \
-		((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-/*
- * Nfs outstanding request list element
- */
-struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
-	struct mbuf	*r_mreq;
-	struct mbuf	*r_mrep;
-	struct mbuf	*r_md;
-	caddr_t		r_dpos;
-	struct nfsmount *r_nmp;
-	struct vnode	*r_vp;
-	u_int32_t	r_xid;
-	int		r_flags;	/* flags on request, see below */
-	int		r_retry;	/* max retransmission count */
-	int		r_rexmit;	/* current retrans count */
-	int		r_timer;	/* tick counter on reply */
-	u_int32_t	r_procnum;	/* NFS procedure number */
-	int		r_rtt;		/* RTT for rpc */
-	struct thread	*r_td;		/* Proc that did I/O system call */
-};
+/* Various values converted to XDR form. */
+extern u_int32_t nfs_false, nfs_true, nfs_xdrneg1, nfs_prog;
+extern u_int32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers;
+extern u_int32_t rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr;
 
-/*
- * Queue head for nfsreq's
- */
-extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
-
-/* Flag values for r_flags */
-#define R_TIMING	0x01		/* timing request (in mntp) */
-#define R_SENT		0x02		/* request has been sent */
-#define	R_SOFTTERM	0x04		/* soft mnt, too many retries */
-#define	R_INTR		0x08		/* intr mnt, signal pending */
-#define	R_SOCKERR	0x10		/* Fatal error on socket */
-#define	R_TPRINTFMSG	0x20		/* Did a tprintf msg. */
-#define	R_MUSTRESEND	0x40		/* Must resend request */
-#define	R_GETONEREP	0x80		/* Probe for one reply only */
+/* Procedure table data */
+extern int	nfsrvv2_procid[NFS_NPROCS];
+extern int	nfsv3_procid[NFS_NPROCS];
+extern int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd,
+		    struct nfssvc_sock *slp, struct thread *td,
+		    struct mbuf **mreqp);
 
 /*
  * A list of nfssvc_sock structures is maintained with all the sockets
  * that require service by the nfsd.
- * The nfsuid structs hang off of the nfssvc_sock structs in both lru
- * and uid hash lists.
  */
-#ifndef NFS_UIDHASHSIZ
-#define	NFS_UIDHASHSIZ	29	/* Tune the size of nfssvc_sock with this */
-#endif
-#define	NUIDHASH(sock, uid) \
-	(&(sock)->ns_uidhashtbl[(uid) % NFS_UIDHASHSIZ])
 #ifndef NFS_WDELAYHASHSIZ
 #define	NFS_WDELAYHASHSIZ 16	/* and with this */
 #endif
 #define	NWDELAYHASH(sock, f) \
 	(&(sock)->ns_wdelayhashtbl[(*((u_int32_t *)(f))) % NFS_WDELAYHASHSIZ])
-#ifndef NFS_MUIDHASHSIZ
-#define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
-#endif
-#define	NMUIDHASH(nmp, uid) \
-	(&(nmp)->nm_uidhashtbl[(uid) % NFS_MUIDHASHSIZ])
-#define	NFSNOHASH(fhsum) \
-	(&nfsnodehashtbl[(fhsum) & nfsnodehash])
 
 /*
  * Network address hash list element
@@ -398,18 +192,6 @@ union nethostaddr {
 	struct sockaddr *had_nam;
 };
 
-struct nfsuid {
-	TAILQ_ENTRY(nfsuid) nu_lru;	/* LRU chain */
-	LIST_ENTRY(nfsuid) nu_hash;	/* Hash list */
-	int		nu_flag;	/* Flags */
-	union nethostaddr nu_haddr;	/* Host addr. for dgram sockets */
-	struct ucred	nu_cr;		/* Cred uid mapped to */
-	int		nu_expire;	/* Expiry time (sec) */
-	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_int32_t	nu_nickname;	/* Nickname on server */
-	NFSKERBKEY_T	nu_key;		/* and session key */
-};
-
 #define	nu_inetaddr	nu_haddr.had_inetaddr
 #define	nu_nam		nu_haddr.had_nam
 /* Bits for nu_flag */
@@ -425,7 +207,6 @@ struct nfsrv_rec {
 
 struct nfssvc_sock {
 	TAILQ_ENTRY(nfssvc_sock) ns_chain;	/* List of all nfssvc_sock's */
-	TAILQ_HEAD(, nfsuid) ns_uidlruhead;
 	struct file	*ns_fp;
 	struct socket	*ns_so;
 	struct sockaddr	*ns_nam;
@@ -437,10 +218,8 @@ struct nfssvc_sock {
 	int		ns_solock;
 	int		ns_cc;
 	int		ns_reclen;
-	int		ns_numuids;
 	u_int32_t	ns_sref;
 	LIST_HEAD(, nfsrv_descript) ns_tq;	/* Write gather lists */
-	LIST_HEAD(, nfsuid) ns_uidhashtbl[NFS_UIDHASHSIZ];
 	LIST_HEAD(nfsrvw_delayhash, nfsrv_descript) ns_wdelayhashtbl[NFS_WDELAYHASHSIZ];
 };
 
@@ -476,8 +255,6 @@ struct nfsd {
 /* Bits for "nfsd_flag" */
 #define	NFSD_WAITING	0x01
 #define	NFSD_REQINPROG	0x02
-#define	NFSD_NEEDAUTH	0x04
-#define	NFSD_AUTHFAIL	0x08
 
 /*
  * This structure is used by the server for describing each request.
@@ -488,8 +265,8 @@ struct nfsrv_descript {
 	off_t			nd_off;		/* Start byte offset */
 	off_t			nd_eoff;	/* and end byte offset */
 	LIST_ENTRY(nfsrv_descript) nd_hash;	/* Hash list */
-	LIST_ENTRY(nfsrv_descript) nd_tq;		/* and timer list */
-	LIST_HEAD(,nfsrv_descript) nd_coalesce;	/* coalesced writes */
+	LIST_ENTRY(nfsrv_descript) nd_tq;	/* and timer list */
+	LIST_HEAD(, nfsrv_descript) nd_coalesce;/* coalesced writes */
 	struct mbuf		*nd_mrep;	/* Request mbuf list */
 	struct mbuf		*nd_md;		/* Current dissect mbuf */
 	struct mbuf		*nd_mreq;	/* Reply mbuf list */
@@ -502,22 +279,13 @@ struct nfsrv_descript {
 	int			nd_len;		/* Length of this write */
 	int			nd_repstat;	/* Reply status */
 	u_int32_t		nd_retxid;	/* Reply xid */
-	u_int32_t		nd_duration;	/* Lease duration */
 	struct timeval		nd_starttime;	/* Time RPC initiated */
 	fhandle_t		nd_fh;		/* File handle */
 	struct ucred		nd_cr;		/* Credentials */
 };
 
 /* Bits for "nd_flag" */
-#define	ND_READ		LEASE_READ
-#define ND_WRITE	LEASE_WRITE
-#define ND_CHECK	0x04
-#define ND_LEASE	(ND_READ | ND_WRITE | ND_CHECK)
 #define ND_NFSV3	0x08
-#define ND_NQNFS	0x10
-#define ND_KERBNICK	0x20
-#define ND_KERBFULL	0x40
-#define ND_KERBAUTH	(ND_KERBNICK | ND_KERBFULL)
 
 extern TAILQ_HEAD(nfsd_head, nfsd) nfsd_head;
 extern int nfsd_head_flag;
@@ -531,8 +299,7 @@ extern int nfsd_head_flag;
 		 !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH))
 
 #define NFSW_SAMECRED(o, n) \
-	(((o)->nd_flag & ND_KERBAUTH) == ((n)->nd_flag & ND_KERBAUTH) && \
- 	 !bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
+	(!bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \
 		sizeof (struct ucred)))
 
 /*
@@ -577,151 +344,94 @@ extern int nfs_debug;
 
 #endif
 
-u_quad_t nfs_curusec __P((void));
-int	nfs_init __P((struct vfsconf *vfsp));
-int	nfs_uninit __P((struct vfsconf *vfsp));
-int	nfs_reply __P((struct nfsreq *));
-int	nfs_getreq __P((struct nfsrv_descript *,struct nfsd *,int));
-int	nfs_send __P((struct socket *, struct sockaddr *, struct mbuf *, 
-		      struct nfsreq *));
-int	nfs_rephead __P((int, struct nfsrv_descript *, struct nfssvc_sock *,
-			 int, int, u_quad_t *, struct mbuf **, struct mbuf **,
-			 caddr_t *));
-int	nfs_sndlock __P((struct nfsreq *));
-void	nfs_sndunlock __P((struct nfsreq *));
-int	nfs_slplock __P((struct nfssvc_sock *, int));
-void	nfs_slpunlock __P((struct nfssvc_sock *));
-int	nfs_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
-int	nfs_vinvalbuf __P((struct vnode *, int, struct ucred *, struct thread *,
-			   int));
-int	nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
-int	nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *, 
-			  int *));
-int	nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt, 
-			struct ucred *cred, struct thread *td));
-int	nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
-int	nfs_asyncio __P((struct buf *, struct ucred *, struct thread *));
-int	nfs_doio __P((struct buf *, struct ucred *, struct thread *));
-int	nfs_readlinkrpc __P((struct vnode *, struct uio *, struct ucred *));
-int	nfs_sigintr __P((struct nfsmount *, struct nfsreq *, struct proc *));
-int	nfs_readdirplusrpc __P((struct vnode *, struct uio *, struct ucred *));
-int	nfsm_disct __P((struct mbuf **, caddr_t *, int, int, caddr_t *));
-void	nfsm_srvfattr __P((struct nfsrv_descript *, struct vattr *, 
-			   struct nfs_fattr *));
-void	nfsm_srvwcc __P((struct nfsrv_descript *, int, struct vattr *, int,
-			 struct vattr *, struct mbuf **, char **));
-void	nfsm_srvpostopattr __P((struct nfsrv_descript *, int, struct vattr *,
-				struct mbuf **, char **));
-int	netaddr_match __P((int, union nethostaddr *, struct sockaddr *));
-int	nfs_request __P((struct vnode *, struct mbuf *, int, struct thread *,
-			 struct ucred *, struct mbuf **, struct mbuf **,
-			 caddr_t *));
-int	nfs_loadattrcache __P((struct vnode **, struct mbuf **, caddr_t *,
-			       struct vattr *, int));
-int	nfs_namei __P((struct nameidata *, fhandle_t *, int,
-		       struct nfssvc_sock *, struct sockaddr *, struct mbuf **,
-		       caddr_t *, struct vnode **, struct thread *, int, int));
-void	nfsm_adj __P((struct mbuf *, int, int));
-int	nfsm_mbuftouio __P((struct mbuf **, struct uio *, int, caddr_t *));
-void	nfsrv_initcache __P((void));
-int	nfs_getauth __P((struct nfsmount *, struct nfsreq *, struct ucred *, 
-			 char **, int *, char *, int *, NFSKERBKEY_T));
-int	nfs_getnickauth __P((struct nfsmount *, struct ucred *, char **, 
-			     int *, char *, int));
-int	nfs_savenickauth __P((struct nfsmount *, struct ucred *, int, 
-			      NFSKERBKEY_T, struct mbuf **, char **,
-			      struct mbuf *));
-int	nfs_adv __P((struct mbuf **, caddr_t *, int, int));
-void	nfs_nhinit __P((void));
-void	nfs_timer __P((void*));
-int	nfsrv_dorec __P((struct nfssvc_sock *, struct nfsd *, 
-			 struct nfsrv_descript **));
-int	nfsrv_getcache __P((struct nfsrv_descript *, struct nfssvc_sock *,
-			    struct mbuf **));
-void	nfsrv_updatecache __P((struct nfsrv_descript *, int, struct mbuf *));
-void	nfsrv_cleancache __P((void));
-int	nfs_connect __P((struct nfsmount *, struct nfsreq *));
-void	nfs_disconnect __P((struct nfsmount *));
-void	nfs_safedisconnect __P((struct nfsmount *));
-int	nfs_getattrcache __P((struct vnode *, struct vattr *));
-int	nfsm_strtmbuf __P((struct mbuf **, char **, const char *, long));
-int	nfs_bioread __P((struct vnode *, struct uio *, int, struct ucred *));
-int	nfsm_uiotombuf __P((struct uio *, struct mbuf **, int, caddr_t *));
-void	nfsrv_init __P((int));
-void	nfs_clearcommit __P((struct mount *));
-int	nfsrv_errmap __P((struct nfsrv_descript *, int));
-void	nfsrvw_sort __P((gid_t *, int));
-void	nfsrv_setcred __P((struct ucred *, struct ucred *));
-int	nfs_writebp __P((struct buf *, int, struct thread *));
-int	nfsrv_object_create __P((struct vnode *));
-void	nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
-int	nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
-			       struct thread *, struct mbuf **));
-int	nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
-			struct thread *td));
-
-int	nfsrv3_access __P((struct nfsrv_descript *nfsd, 
-			   struct nfssvc_sock *slp,
-			   struct thread *td, struct mbuf **mrq));
-int	nfsrv_commit __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_create __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_fhtovp __P((fhandle_t *, int, struct vnode **, struct ucred *,
-			  struct nfssvc_sock *, struct sockaddr *, int *, 
-			  int, int));
-int	nfsrv_setpublicfs __P((struct mount *, struct netexport *,
-			       struct export_args *));
-int	nfs_ispublicfh __P((fhandle_t *));
-int	nfsrv_fsinfo __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_getattr __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			   struct thread *td, struct mbuf **mrq));
-int	nfsrv_link __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct thread *td, struct mbuf **mrq));
-int	nfsrv_lookup __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_mkdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct thread *td, struct mbuf **mrq));
-int	nfsrv_mknod __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct thread *td, struct mbuf **mrq));
-int	nfsrv_noop __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct thread *td, struct mbuf **mrq));
-int	nfsrv_null __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct thread *td, struct mbuf **mrq));
-int	nfsrv_pathconf __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct thread *td,
-			    struct mbuf **mrq));
-int	nfsrv_read __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			struct thread *td, struct mbuf **mrq));
-int	nfsrv_readdir __P((struct nfsrv_descript *nfsd, 
-			   struct nfssvc_sock *slp,
-			   struct thread *td, struct mbuf **mrq));
-int	nfsrv_readdirplus __P((struct nfsrv_descript *nfsd,
-			       struct nfssvc_sock *slp, struct thread *td,
-			       struct mbuf **mrq));
-int	nfsrv_readlink __P((struct nfsrv_descript *nfsd,
-			    struct nfssvc_sock *slp, struct thread *td,
-			    struct mbuf **mrq));
-int	nfsrv_remove __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_rename __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_rmdir __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct thread *td, struct mbuf **mrq));
-int	nfsrv_setattr __P((struct nfsrv_descript *nfsd, 
-			   struct nfssvc_sock *slp,
-			   struct thread *td, struct mbuf **mrq));
-int	nfsrv_statfs __P((struct nfsrv_descript *nfsd, 
-			  struct nfssvc_sock *slp,
-			  struct thread *td, struct mbuf **mrq));
-int	nfsrv_symlink __P((struct nfsrv_descript *nfsd, 
-			   struct nfssvc_sock *slp,
-			   struct thread *td, struct mbuf **mrq));
-int	nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-			 struct thread *td, struct mbuf **mrq));
-void	nfsrv_rcv __P((struct socket *so, void *arg, int waitflag));
-void	nfsrv_slpderef __P((struct nfssvc_sock *slp));
+int	nfs_getreq(struct nfsrv_descript *, struct nfsd *, int);
+int	nfsrv_send(struct socket *, struct sockaddr *, struct mbuf *);
+void	nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *,
+	    int, struct mbuf **, struct mbuf **, caddr_t *);
+int	nfs_slplock(struct nfssvc_sock *, int);
+void	nfs_slpunlock(struct nfssvc_sock *);
+void	nfsm_srvfattr(struct nfsrv_descript *, struct vattr *,
+	    struct nfs_fattr *);
+void	nfsm_srvwcc(struct nfsrv_descript *, int, struct vattr *, int,
+	    struct vattr *, struct mbuf **, char **);
+void	nfsm_srvpostopattr(struct nfsrv_descript *, int, struct vattr *,
+	    struct mbuf **, char **);
+int	netaddr_match(int, union nethostaddr *, struct sockaddr *);
+int	nfs_namei(struct nameidata *, fhandle_t *, int,
+	    struct nfssvc_sock *, struct sockaddr *, struct mbuf **,
+	    caddr_t *, struct vnode **, struct thread *, int);
+void	nfsm_adj(struct mbuf *, int, int);
+int	nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);
+void	nfsrv_initcache(void);
+void	nfsrv_timer(void*);
+int	nfsrv_dorec(struct nfssvc_sock *, struct nfsd *,
+	    struct nfsrv_descript **);
+int	nfsrv_getcache(struct nfsrv_descript *, struct nfssvc_sock *,
+	    struct mbuf **);
+void	nfsrv_updatecache(struct nfsrv_descript *, int, struct mbuf *);
+void	nfsrv_cleancache(void);
+void	nfsrv_init(int);
+int	nfsrv_errmap(struct nfsrv_descript *, int);
+void	nfsrvw_sort(gid_t *, int);
+void	nfsrv_setcred(struct ucred *, struct ucred *);
+int	nfsrv_object_create(struct vnode *);
+void	nfsrv_wakenfsd(struct nfssvc_sock *slp);
+int	nfsrv_writegather(struct nfsrv_descript **, struct nfssvc_sock *,
+	    struct thread *, struct mbuf **);
+
+int	nfsrv3_access(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_commit(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_fhtovp(fhandle_t *, int, struct vnode **, struct ucred *,
+	    struct nfssvc_sock *, struct sockaddr *, int *, int);
+int	nfsrv_setpublicfs(struct mount *, struct netexport *,
+	    struct export_args *);
+int	nfs_ispublicfh(fhandle_t *);
+int	nfsrv_fsinfo(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_getattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_link(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_noop(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_null(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_pathconf(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_rmdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_setattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_statfs(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+int	nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
+	    struct thread *td, struct mbuf **mrq);
+void	nfsrv_rcv(struct socket *so, void *arg, int waitflag);
+void	nfsrv_slpderef(struct nfssvc_sock *slp);
 #endif	/* _KERNEL */
 
 #endif