For the on-the-wire protocol, u_long -> u_int32_t; long -> int32_t;

int -> int32_t; u_short -> u_int16_t.  Also, use mode_t instead of u_short
for storing modes (mode_t is a u_int16_t).

Obtained from: NetBSD

9 files changed, 322 insertions, 319 deletions

diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index a9fa37e..784df74 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.38 1998/05/31 17:48:03 peter Exp $
+ * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -204,14 +204,14 @@ struct nfsd_args {
 struct nfsd_srvargs {
 	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
 	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
+	u_int32_t	nsd_haddr;	/* Ip address of client */
 	struct ucred	nsd_cr;		/* Cred. uid maps to */
 	int		nsd_authlen;	/* Length of auth string (ret) */
 	u_char		*nsd_authstr;	/* Auth string (ret) */
 	int		nsd_verflen;	/* and the verfier */
 	u_char		*nsd_verfstr;
 	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_long		nsd_ttl;	/* credential ttl (sec) */
+	u_int32_t	nsd_ttl;	/* credential ttl (sec) */
 	NFSKERBKEY_T	nsd_key;	/* Session key */
 };
 
@@ -342,7 +342,7 @@ struct nfsreq {
 	caddr_t		r_dpos;
 	struct nfsmount *r_nmp;
 	struct vnode	*r_vp;
-	u_long		r_xid;
+	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 */
@@ -382,7 +382,7 @@ extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 #define	NFS_WDELAYHASHSIZ 16	/* and with this */
 #endif
 #define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((u_long *)(f))) % NFS_WDELAYHASHSIZ])
+	(&(sock)->ns_wdelayhashtbl[(*((u_int32_t *)(f))) % NFS_WDELAYHASHSIZ])
 #ifndef NFS_MUIDHASHSIZ
 #define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
 #endif
@@ -395,7 +395,7 @@ extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
  * Network address hash list element
  */
 union nethostaddr {
-	u_long had_inetaddr;
+	u_int32_t had_inetaddr;
 	struct sockaddr *had_nam;
 };
 
@@ -407,7 +407,7 @@ struct nfsuid {
 	struct ucred	nu_cr;		/* Cred uid mapped to */
 	int		nu_expire;	/* Expiry time (sec) */
 	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_long		nu_nickname;	/* Nickname on server */
+	u_int32_t	nu_nickname;	/* Nickname on server */
 	NFSKERBKEY_T	nu_key;		/* and session key */
 };
 
@@ -439,7 +439,7 @@ struct nfssvc_sock {
 	int		ns_cc;
 	int		ns_reclen;
 	int		ns_numuids;
-	u_long		ns_sref;
+	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];
@@ -502,8 +502,8 @@ struct nfsrv_descript {
 	int			nd_flag;	/* nd_flag */
 	int			nd_len;		/* Length of this write */
 	int			nd_repstat;	/* Reply status */
-	u_long			nd_retxid;	/* Reply xid */
-	u_long			nd_duration;	/* Lease duration */
+	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 */
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 4559075..2b1e586 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.66 1998/05/31 19:10:52 peter Exp $
+ * $Id: nfs_serv.c,v 1.67 1998/05/31 19:43:34 peter Exp $
  */
 
 /*
@@ -91,8 +91,8 @@ nfstype nfsv3_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK, NFSOCK,
 nfstype nfsv2_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK, NFNON,
 		      NFCHR, NFNON };
 /* Global vars */
-extern u_long nfs_xdrneg1;
-extern u_long nfs_false, nfs_true;
+extern u_int32_t nfs_xdrneg1;
+extern u_int32_t nfs_false, nfs_true;
 extern enum vtype nv3tov_type[8];
 extern struct nfsstats nfsstats;
 
@@ -124,8 +124,8 @@ nfsrv3_access(nfsd, slp, procp, mrq)
 	struct vnode *vp;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, getret;
 	char *cp2;
@@ -139,7 +139,7 @@ nfsrv3_access(nfsd, slp, procp, mrq)
 #endif
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
-	nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 	error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly,
 	    (nfsd->nd_flag & ND_KERBAUTH), TRUE);
 	if (error) {
@@ -147,7 +147,7 @@ nfsrv3_access(nfsd, slp, procp, mrq)
 		nfsm_srvpostop_attr(1, (struct vattr *)0);
 		return (0);
 	}
-	nfsmode = fxdr_unsigned(u_long, *tl);
+	nfsmode = fxdr_unsigned(u_int32_t, *tl);
 	if ((nfsmode & NFSV3ACCESS_READ) &&
 		nfsrv_access(vp, VREAD, cred, rdonly, procp, 0))
 		nfsmode &= ~NFSV3ACCESS_READ;
@@ -170,7 +170,7 @@ nfsrv3_access(nfsd, slp, procp, mrq)
 	vput(vp);
 	nfsm_reply(NFSX_POSTOPATTR(1) + NFSX_UNSIGNED);
 	nfsm_srvpostop_attr(getret, vap);
-	nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 	*tl = txdr_unsigned(nfsmode);
 	nfsm_srvdone;
 }
@@ -195,8 +195,8 @@ nfsrv_getattr(nfsd, slp, procp, mrq)
 	struct vnode *vp;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache;
 	char *cp2;
@@ -243,8 +243,8 @@ nfsrv_setattr(nfsd, slp, procp, mrq)
 	struct vnode *vp;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, preat_ret = 1, postat_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3), gcheck = 0;
@@ -258,10 +258,10 @@ nfsrv_setattr(nfsd, slp, procp, mrq)
 	VATTR_NULL(vap);
 	if (v3) {
 		nfsm_srvsattr(vap);
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 		gcheck = fxdr_unsigned(int, *tl);
 		if (gcheck) {
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			fxdr_nfsv3time(tl, &guard);
 		}
 	} else {
@@ -286,7 +286,7 @@ nfsrv_setattr(nfsd, slp, procp, mrq)
 			fxdr_nfsv2time(&sp->sa_atime, &vap->va_atime);
 #else
 			vap->va_atime.tv_sec =
-				fxdr_unsigned(long, sp->sa_atime.nfsv2_sec);
+				fxdr_unsigned(int32_t, sp->sa_atime.nfsv2_sec);
 			vap->va_atime.tv_nsec = 0;
 #endif
 		}
@@ -374,8 +374,8 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	register caddr_t cp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, dirattr_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3), pubflag;
@@ -492,8 +492,8 @@ nfsrv_readlink(nfsd, slp, procp, mrq)
 	struct iovec iv[(NFS_MAXPATHLEN+MLEN-1)/MLEN];
 	register struct iovec *ivp = iv;
 	register struct mbuf *mp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, i, tlen, len, getret;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -573,7 +573,7 @@ out:
 		tlen = nfsm_rndup(len);
 		nfsm_adj(mp3, NFS_MAXPATHLEN-tlen, tlen-len);
 	}
-	nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 	*tl = txdr_unsigned(len);
 	mb->m_next = mp3;
 	nfsm_srvdone;
@@ -597,8 +597,8 @@ nfsrv_read(nfsd, slp, procp, mrq)
 	struct iovec *iv2;
 	register struct mbuf *m;
 	register struct nfs_fattr *fp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	register int i;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, cnt, len, left, siz, tlen, getret;
@@ -617,11 +617,11 @@ nfsrv_read(nfsd, slp, procp, mrq)
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
 	if (v3) {
-		nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 		fxdr_hyper(tl, &off);
 	} else {
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
-		off = (off_t)fxdr_unsigned(u_long, *tl);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
+		off = (off_t)fxdr_unsigned(u_int32_t, *tl);
 	}
 	nfsm_srvstrsiz(reqlen, NFS_SRVMAXDATA(nfsd));
 	error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam,
@@ -659,14 +659,14 @@ nfsrv_read(nfsd, slp, procp, mrq)
 		cnt = reqlen;
 	nfsm_reply(NFSX_POSTOPORFATTR(v3) + 3 * NFSX_UNSIGNED+nfsm_rndup(cnt));
 	if (v3) {
-		nfsm_build(tl, u_long *, NFSX_V3FATTR + 4 * NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, NFSX_V3FATTR + 4 * NFSX_UNSIGNED);
 		*tl++ = nfs_true;
 		fp = (struct nfs_fattr *)tl;
-		tl += (NFSX_V3FATTR / sizeof (u_long));
+		tl += (NFSX_V3FATTR / sizeof (u_int32_t));
 	} else {
-		nfsm_build(tl, u_long *, NFSX_V2FATTR + NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, NFSX_V2FATTR + NFSX_UNSIGNED);
 		fp = (struct nfs_fattr *)tl;
-		tl += (NFSX_V2FATTR / sizeof (u_long));
+		tl += (NFSX_V2FATTR / sizeof (u_int32_t));
 	}
 	len = left = cnt;
 	if (cnt > 0) {
@@ -766,8 +766,8 @@ nfsrv_write(nfsd, slp, procp, mrq)
 	struct iovec *iv;
 	struct vattr va, forat;
 	register struct vattr *vap = &va;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, len, forat_ret = 1;
 	int ioflags, aftat_ret = 1, retlen, zeroing, adjust;
@@ -789,18 +789,18 @@ nfsrv_write(nfsd, slp, procp, mrq)
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
 	if (v3) {
-		nfsm_dissect(tl, u_long *, 5 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
 		fxdr_hyper(tl, &off);
 		tl += 3;
 		stable = fxdr_unsigned(int, *tl++);
 	} else {
-		nfsm_dissect(tl, u_long *, 4 * NFSX_UNSIGNED);
-		off = (off_t)fxdr_unsigned(u_long, *++tl);
+		nfsm_dissect(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
+		off = (off_t)fxdr_unsigned(u_int32_t, *++tl);
 		tl += 2;
 		if (nfs_async)
 	    		stable = NFSV3WRITE_UNSTABLE;
 	}
-	retlen = len = fxdr_unsigned(long, *tl);
+	retlen = len = fxdr_unsigned(int32_t, *tl);
 	cnt = i = 0;
 
 	/*
@@ -912,7 +912,7 @@ nfsrv_write(nfsd, slp, procp, mrq)
 		nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, vap);
 		if (error)
 			return (0);
-		nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
 		*tl++ = txdr_unsigned(retlen);
 		/*
 		 * If nfs_async is set, then pretend the write was FILESYNC.
@@ -958,8 +958,8 @@ nfsrv_writegather(ndp, slp, procp, mrq)
 	struct nfsrvw_delayhash *wpp;
 	struct ucred *cred;
 	struct vattr va, forat;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos, dpos;
 	int error = 0, rdonly, cache, len, forat_ret = 1;
 	int ioflags, aftat_ret = 1, s, adjust, v3, zeroing;
@@ -994,18 +994,18 @@ nfsrv_writegather(ndp, slp, procp, mrq)
 	     */
 	    nfsm_srvmtofh(&nfsd->nd_fh);
 	    if (v3) {
-		nfsm_dissect(tl, u_long *, 5 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
 		fxdr_hyper(tl, &nfsd->nd_off);
 		tl += 3;
 		nfsd->nd_stable = fxdr_unsigned(int, *tl++);
 	    } else {
-		nfsm_dissect(tl, u_long *, 4 * NFSX_UNSIGNED);
-		nfsd->nd_off = (off_t)fxdr_unsigned(u_long, *++tl);
+		nfsm_dissect(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
+		nfsd->nd_off = (off_t)fxdr_unsigned(u_int32_t, *++tl);
 		tl += 2;
 		if (nfs_async)
 			nfsd->nd_stable = NFSV3WRITE_UNSTABLE;
 	    }
-	    len = fxdr_unsigned(long, *tl);
+	    len = fxdr_unsigned(int32_t, *tl);
 	    nfsd->nd_len = len;
 	    nfsd->nd_eoff = nfsd->nd_off + len;
     
@@ -1198,7 +1198,7 @@ loop1:
 			    NFSX_WRITEVERF(v3), v3);
 			if (v3) {
 			    nfsm_srvwcc_data(forat_ret, &forat, aftat_ret, &va);
-			    nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED);
+			    nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
 			    *tl++ = txdr_unsigned(nfsd->nd_len);
 			    *tl++ = txdr_unsigned(swp->nd_stable);
 			    /*
@@ -1328,10 +1328,10 @@ nfsrv_create(nfsd, slp, procp, mrq)
 	struct vattr va, dirfor, diraft;
 	register struct vattr *vap = &va;
 	register struct nfsv2_sattr *sp;
-	register u_long *tl;
+	register u_int32_t *tl;
 	struct nameidata nd;
 	register caddr_t cp;
-	register long t1;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdev, cache, len, tsize, dirfor_ret = 1, diraft_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3), how, exclusive_flag = 0;
@@ -1373,7 +1373,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 	}
 	VATTR_NULL(vap);
 	if (v3) {
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 		how = fxdr_unsigned(int, *tl);
 		switch (how) {
 		case NFSV3CREATE_GUARDED:
@@ -1395,13 +1395,13 @@ nfsrv_create(nfsd, slp, procp, mrq)
 		vap->va_type = VREG;
 	} else {
 		nfsm_dissect(sp, struct nfsv2_sattr *, NFSX_V2SATTR);
-		vap->va_type = IFTOVT(fxdr_unsigned(u_long, sp->sa_mode));
+		vap->va_type = IFTOVT(fxdr_unsigned(u_int32_t, sp->sa_mode));
 		if (vap->va_type == VNON)
 			vap->va_type = VREG;
 		vap->va_mode = nfstov_mode(sp->sa_mode);
 		switch (vap->va_type) {
 		case VREG:
-			tsize = fxdr_unsigned(long, sp->sa_size);
+			tsize = fxdr_unsigned(int32_t, sp->sa_size);
 			if (tsize != -1)
 				vap->va_size = (u_quad_t)tsize;
 			break;
@@ -1569,12 +1569,12 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 	struct ucred *cred = &nfsd->nd_cr;
 	struct vattr va, dirfor, diraft;
 	register struct vattr *vap = &va;
-	register u_long *tl;
+	register u_int32_t *tl;
 	struct nameidata nd;
-	register long t1;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, dirfor_ret = 1, diraft_ret = 1;
-	u_long major, minor;
+	u_int32_t major, minor;
 	enum vtype vtyp;
 	char *cp2;
 	struct mbuf *mb, *mb2, *mreq;
@@ -1601,7 +1601,7 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 			vrele(dirp);
 		return (0);
 	}
-	nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 	vtyp = nfsv3tov_type(*tl);
 	if (vtyp != VCHR && vtyp != VBLK && vtyp != VSOCK && vtyp != VFIFO) {
 		vrele(nd.ni_startdir);
@@ -1614,9 +1614,9 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 	VATTR_NULL(vap);
 	nfsm_srvsattr(vap);
 	if (vtyp == VCHR || vtyp == VBLK) {
-		nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
-		major = fxdr_unsigned(u_long, *tl++);
-		minor = fxdr_unsigned(u_long, *tl);
+		nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
+		major = fxdr_unsigned(u_int32_t, *tl++);
+		minor = fxdr_unsigned(u_int32_t, *tl);
 		vap->va_rdev = makedev(major, minor);
 	}
 
@@ -1720,8 +1720,8 @@ nfsrv_remove(nfsd, slp, procp, mrq)
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
 	struct nameidata nd;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, dirfor_ret = 1, diraft_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -1805,8 +1805,8 @@ nfsrv_rename(nfsd, slp, procp, mrq)
 	struct sockaddr *nam = nfsd->nd_nam;
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, len2, fdirfor_ret = 1, fdiraft_ret = 1;
 	int tdirfor_ret = 1, tdiraft_ret = 1;
@@ -2012,8 +2012,8 @@ nfsrv_link(nfsd, slp, procp, mrq)
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
 	struct nameidata nd;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, len, dirfor_ret = 1, diraft_ret = 1;
 	int getret = 1, v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -2115,8 +2115,8 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 	struct vattr va, dirfor, diraft;
 	struct nameidata nd;
 	register struct vattr *vap = &va;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	struct nfsv2_sattr *sp;
 	char *bpos, *pathcp = (char *)0, *cp2;
 	struct uio io;
@@ -2166,7 +2166,7 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 	nfsm_mtouio(&io, len2);
 	if (!v3) {
 		nfsm_dissect(sp, struct nfsv2_sattr *, NFSX_V2SATTR);
-		vap->va_mode = fxdr_unsigned(u_short, sp->sa_mode);
+		vap->va_mode = fxdr_unsigned(u_int16_t, sp->sa_mode);
 	}
 	*(pathcp + len2) = '\0';
 	if (nd.ni_vp) {
@@ -2261,8 +2261,8 @@ nfsrv_mkdir(nfsd, slp, procp, mrq)
 	register struct nfs_fattr *fp;
 	struct nameidata nd;
 	register caddr_t cp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, dirfor_ret = 1, diraft_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -2301,7 +2301,7 @@ nfsrv_mkdir(nfsd, slp, procp, mrq)
 	if (v3) {
 		nfsm_srvsattr(vap);
 	} else {
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 		vap->va_mode = nfstov_mode(*tl++);
 	}
 	vap->va_type = VDIR;
@@ -2373,8 +2373,8 @@ nfsrv_rmdir(nfsd, slp, procp, mrq)
 	struct sockaddr *nam = nfsd->nd_nam;
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, cache, len, dirfor_ret = 1, diraft_ret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -2485,11 +2485,11 @@ out:
  */
 struct flrep {
 	nfsuint64	fl_off;
-	u_long		fl_postopok;
-	u_long		fl_fattr[NFSX_V3FATTR / sizeof (u_long)];
-	u_long		fl_fhok;
-	u_long		fl_fhsize;
-	u_long		fl_nfh[NFSX_V3FH / sizeof (u_long)];
+	u_int32_t	fl_postopok;
+	u_int32_t	fl_fattr[NFSX_V3FATTR / sizeof (u_int32_t)];
+	u_int32_t	fl_fhok;
+	u_int32_t	fl_fhsize;
+	u_int32_t	fl_nfh[NFSX_V3FH / sizeof (u_int32_t)];
 };
 
 int
@@ -2507,8 +2507,8 @@ nfsrv_readdir(nfsd, slp, procp, mrq)
 	register struct mbuf *mp;
 	register struct dirent *dp;
 	register caddr_t cp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	struct mbuf *mb, *mb2, *mreq, *mp2;
 	char *cpos, *cend, *cp2, *rbuf;
@@ -2522,18 +2522,18 @@ nfsrv_readdir(nfsd, slp, procp, mrq)
 	int siz, cnt, fullsiz, eofflag, rdonly, cache, ncookies;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
 	u_quad_t frev, off, toff, verf;
-	u_long *cookies = NULL, *cookiep;
+	u_long *cookies = NULL, *cookiep; /* needs to be int64_t or off_t */
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
 	if (v3) {
-		nfsm_dissect(tl, u_long *, 5 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
 		fxdr_hyper(tl, &toff);
 		tl += 2;
 		fxdr_hyper(tl, &verf);
 		tl += 2;
 	} else {
-		nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 		toff = fxdr_unsigned(u_quad_t, *tl++);
 	}
 	off = toff;
@@ -2621,11 +2621,11 @@ again:
 				2 * NFSX_UNSIGNED);
 			if (v3) {
 				nfsm_srvpostop_attr(getret, &at);
-				nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED);
+				nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
 				txdr_hyper(&at.va_filerev, tl);
 				tl += 2;
 			} else
-				nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+				nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			*tl++ = nfs_false;
 			*tl = nfs_true;
 			FREE((caddr_t)rbuf, M_TEMP);
@@ -2667,7 +2667,7 @@ again:
 	nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_COOKIEVERF(v3) + siz);
 	if (v3) {
 		nfsm_srvpostop_attr(getret, &at);
-		nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 		txdr_hyper(&at.va_filerev, tl);
 	}
 	mp = mp2 = mb;
@@ -2720,7 +2720,7 @@ again:
 				if (xfer > 0)
 					cp += tsiz;
 			}
-			/* And null pad to a long boundary */
+			/* And null pad to a int32_t boundary */
 			for (i = 0; i < rem; i++)
 				*bp++ = '\0';
 			nfsm_clget;
@@ -2774,8 +2774,8 @@ nfsrv_readdirplus(nfsd, slp, procp, mrq)
 	register struct mbuf *mp;
 	register struct dirent *dp;
 	register caddr_t cp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	struct mbuf *mb, *mb2, *mreq, *mp2;
 	char *cpos, *cend, *cp2, *rbuf;
@@ -2790,11 +2790,11 @@ nfsrv_readdirplus(nfsd, slp, procp, mrq)
 	int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
 	int siz, cnt, fullsiz, eofflag, rdonly, cache, dirlen, ncookies;
 	u_quad_t frev, off, toff, verf;
-	u_long *cookies = NULL, *cookiep;
+	u_long *cookies = NULL, *cookiep; /* needs to be int64_t or off_t */
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
-	nfsm_dissect(tl, u_long *, 6 * NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, 6 * NFSX_UNSIGNED);
 	fxdr_hyper(tl, &toff);
 	tl += 2;
 	fxdr_hyper(tl, &verf);
@@ -2881,7 +2881,7 @@ again:
 			nfsm_reply(NFSX_V3POSTOPATTR + NFSX_V3COOKIEVERF +
 				2 * NFSX_UNSIGNED);
 			nfsm_srvpostop_attr(getret, &at);
-			nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED);
+			nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
 			txdr_hyper(&at.va_filerev, tl);
 			tl += 2;
 			*tl++ = nfs_false;
@@ -2939,7 +2939,7 @@ again:
 	dirlen = len = NFSX_V3POSTOPATTR + NFSX_V3COOKIEVERF + 2 * NFSX_UNSIGNED;
 	nfsm_reply(cnt);
 	nfsm_srvpostop_attr(getret, &at);
-	nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 	txdr_hyper(&at.va_filerev, tl);
 	mp = mp2 = mb;
 	bp = bpos;
@@ -3024,7 +3024,7 @@ again:
 				if (xfer > 0)
 					cp += tsiz;
 			}
-			/* And null pad to a long boundary */
+			/* And null pad to a int32_t boundary */
 			for (i = 0; i < rem; i++)
 				*bp++ = '\0';
 	
@@ -3090,8 +3090,8 @@ nfsrv_commit(nfsd, slp, procp, mrq)
 	struct vnode *vp;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, for_ret = 1, aft_ret = 1, cnt, cache;
 	char *cp2;
@@ -3103,7 +3103,7 @@ nfsrv_commit(nfsd, slp, procp, mrq)
 #endif
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
-	nfsm_dissect(tl, u_long *, 3 * NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 
 	/*
 	 * XXX At this time VOP_FSYNC() does not accept offset and byte
@@ -3130,7 +3130,7 @@ nfsrv_commit(nfsd, slp, procp, mrq)
 	nfsm_reply(NFSX_V3WCCDATA + NFSX_V3WRITEVERF);
 	nfsm_srvwcc_data(for_ret, &bfor, aft_ret, &aft);
 	if (!error) {
-		nfsm_build(tl, u_long *, NFSX_V3WRITEVERF);
+		nfsm_build(tl, u_int32_t *, NFSX_V3WRITEVERF);
 		*tl++ = txdr_unsigned(boottime.tv_sec);
 		*tl = txdr_unsigned(boottime.tv_usec);
 	} else
@@ -3154,8 +3154,8 @@ nfsrv_statfs(nfsd, slp, procp, mrq)
 	struct ucred *cred = &nfsd->nd_cr;
 	register struct statfs *sf;
 	register struct nfs_statfs *sfp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, getret = 1;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
@@ -3231,9 +3231,9 @@ nfsrv_fsinfo(nfsd, slp, procp, mrq)
 	struct sockaddr *nam = nfsd->nd_nam;
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register struct nfsv3_fsinfo *sip;
-	register long t1;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, getret = 1, pref;
 	char *cp2;
@@ -3307,9 +3307,9 @@ nfsrv_pathconf(nfsd, slp, procp, mrq)
 	struct sockaddr *nam = nfsd->nd_nam;
 	caddr_t dpos = nfsd->nd_dpos;
 	struct ucred *cred = &nfsd->nd_cr;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register struct nfsv3_pathconf *pc;
-	register long t1;
+	register int32_t t1;
 	caddr_t bpos;
 	int error = 0, rdonly, cache, getret = 1, linkmax, namemax;
 	int chownres, notrunc;
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 8fcefeb..55a003c 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.38 1998/05/31 18:08:09 peter Exp $
+ * $Id: nfs_socket.c,v 1.39 1998/05/31 19:49:30 peter Exp $
  */
 
 /*
@@ -93,10 +93,10 @@
 /*
  * External data, mostly RPC constants in XDR form
  */
-extern u_long rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers, rpc_auth_unix,
-	rpc_msgaccepted, rpc_call, rpc_autherr,
+extern u_int32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers,
+	rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr,
 	rpc_auth_kerb;
-extern u_long nfs_prog, nqnfs_prog;
+extern u_int32_t nfs_prog, nqnfs_prog;
 extern time_t nqnfsstarttime;
 extern struct nfsstats nfsstats;
 extern int nfsv3_procid[NFS_NPROCS];
@@ -191,7 +191,7 @@ nfs_connect(nmp, rep)
 	struct sockaddr *saddr;
 	struct sockaddr_in *sin;
 	struct mbuf *m;
-	u_short tport;
+	u_int16_t tport;
 	struct proc *p = &proc0; /* only used for socreate and sobind */
 
 	nmp->nm_so = (struct socket *)0;
@@ -283,20 +283,20 @@ nfs_connect(nmp, rep)
 			panic("nfscon sotype");
 		if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
 			MGET(m, M_WAIT, MT_SOOPTS);
-			*mtod(m, int *) = 1;
-			m->m_len = sizeof(int);
+			*mtod(m, int32_t *) = 1;
+			m->m_len = sizeof(int32_t);
 			sosetopt(so, SOL_SOCKET, SO_KEEPALIVE, m, p);
 		}
 		if (so->so_proto->pr_protocol == IPPROTO_TCP) {
 			MGET(m, M_WAIT, MT_SOOPTS);
-			*mtod(m, int *) = 1;
-			m->m_len = sizeof(int);
+			*mtod(m, int32_t *) = 1;
+			m->m_len = sizeof(int32_t);
 			sosetopt(so, IPPROTO_TCP, TCP_NODELAY, m, p);
 		}
-		sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR + sizeof (u_long))
-				* 2;
-		rcvreserve = (nmp->nm_rsize + NFS_MAXPKTHDR + sizeof (u_long))
-				* 2;
+		sndreserve = (nmp->nm_wsize + NFS_MAXPKTHDR +
+		    sizeof (u_int32_t)) * 2;
+		rcvreserve = (nmp->nm_rsize + NFS_MAXPKTHDR +
+		    sizeof (u_int32_t)) * 2;
 	}
 	error = soreserve(so, sndreserve, rcvreserve);
 	if (error)
@@ -371,11 +371,11 @@ nfs_disconnect(nmp)
 	}
 }
 
-void   
+void
 nfs_safedisconnect(nmp)
 	struct nfsmount *nmp;
 {
-	struct nfsreq dummyreq; 
+	struct nfsreq dummyreq;
 
 	bzero(&dummyreq, sizeof(dummyreq));
 	dummyreq.r_nmp = nmp;
@@ -476,7 +476,7 @@ nfs_receive(rep, aname, mp)
 	struct iovec aio;
 	register struct mbuf *m;
 	struct mbuf *control;
-	u_long len;
+	u_int32_t len;
 	struct sockaddr **getnam;
 	int error, sotype, rcvflg;
 	struct proc *p = curproc;	/* XXX */
@@ -543,13 +543,13 @@ tryagain:
 		nfs_sndunlock(&rep->r_nmp->nm_flag, &rep->r_nmp->nm_state);
 		if (sotype == SOCK_STREAM) {
 			aio.iov_base = (caddr_t) &len;
-			aio.iov_len = sizeof(u_long);
+			aio.iov_len = sizeof(u_int32_t);
 			auio.uio_iov = &aio;
 			auio.uio_iovcnt = 1;
 			auio.uio_segflg = UIO_SYSSPACE;
 			auio.uio_rw = UIO_READ;
 			auio.uio_offset = 0;
-			auio.uio_resid = sizeof(u_long);
+			auio.uio_resid = sizeof(u_int32_t);
 			auio.uio_procp = p;
 			do {
 			   rcvflg = MSG_WAITALL;
@@ -572,8 +572,8 @@ tryagain:
 			    if (auio.uio_resid != sizeof (u_int32_t))
 			    log(LOG_INFO,
 				 "short receive (%d/%d) from nfs server %s\n",
-				 sizeof(u_long) - auio.uio_resid,
-				 sizeof(u_long),
+				 sizeof(u_int32_t) - auio.uio_resid,
+				 sizeof(u_int32_t),
 				 rep->r_nmp->nm_mountp->mnt_stat.f_mntfromname);
 			    error = EPIPE;
 			}
@@ -703,10 +703,10 @@ nfs_reply(myrep)
 {
 	register struct nfsreq *rep;
 	register struct nfsmount *nmp = myrep->r_nmp;
-	register long t1;
+	register int32_t t1;
 	struct mbuf *mrep, *md;
 	struct sockaddr *nam;
-	u_long rxid, *tl;
+	u_int32_t rxid, *tl;
 	caddr_t dpos, cp2;
 	int error;
 
@@ -756,7 +756,7 @@ nfs_reply(myrep)
 		 */
 		md = mrep;
 		dpos = mtod(md, caddr_t);
-		nfsm_dissect(tl, u_long *, 2*NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 2*NFSX_UNSIGNED);
 		rxid = *tl++;
 		if (*tl != rpc_reply) {
 #ifndef NFS_NOSERVER
@@ -885,7 +885,7 @@ nfs_request(vp, mrest, procnum, procp, cred, mrp, mdp, dposp)
 {
 	register struct mbuf *m, *mrep;
 	register struct nfsreq *rep;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register int i;
 	struct nfsmount *nmp;
 	struct mbuf *md, *mheadend;
@@ -896,7 +896,7 @@ nfs_request(vp, mrest, procnum, procp, cred, mrp, mdp, dposp)
 	int t1, nqlflag, cachable, s, error = 0, mrest_len, auth_len, auth_type;
 	int trylater_delay = NQ_TRYLATERDEL, trylater_cnt = 0, failed_auth = 0;
 	int verf_len, verf_type;
-	u_long xid;
+	u_int32_t xid;
 	u_quad_t frev;
 	char *auth_str, *verf_str;
 	NFSKERBKEY_T key;		/* save session key */
@@ -953,7 +953,7 @@ kerbauth:
 	 */
 	if (nmp->nm_sotype == SOCK_STREAM) {
 		M_PREPEND(m, NFSX_UNSIGNED, M_WAIT);
-		*mtod(m, u_long *) = htonl(0x80000000 |
+		*mtod(m, u_int32_t *) = htonl(0x80000000 |
 			 (m->m_pkthdr.len - NFSX_UNSIGNED));
 	}
 	rep->r_mreq = m;
@@ -1050,7 +1050,7 @@ tryagain:
 	/*
 	 * break down the rpc header and check if ok
 	 */
-	nfsm_dissect(tl, u_long *, 3 * NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 	if (*tl++ == rpc_msgdenied) {
 		if (*tl == rpc_mismatch)
 			error = EOPNOTSUPP;
@@ -1075,17 +1075,17 @@ tryagain:
 	 * Grab any Kerberos verifier, otherwise just throw it away.
 	 */
 	verf_type = fxdr_unsigned(int, *tl++);
-	i = fxdr_unsigned(int, *tl);
+	i = fxdr_unsigned(int32_t, *tl);
 	if ((nmp->nm_flag & NFSMNT_KERB) && verf_type == RPCAUTH_KERB4) {
 		error = nfs_savenickauth(nmp, cred, i, key, &md, &dpos, mrep);
 		if (error)
 			goto nfsmout;
 	} else if (i > 0)
 		nfsm_adv(nfsm_rndup(i));
-	nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 	/* 0 == ok */
 	if (*tl == 0) {
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 		if (*tl != 0) {
 			error = fxdr_unsigned(int, *tl);
 			if ((nmp->nm_flag & NFSMNT_NFSV3) &&
@@ -1124,11 +1124,11 @@ tryagain:
 		 * For nqnfs, get any lease in reply
 		 */
 		if (nmp->nm_flag & NFSMNT_NQNFS) {
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 			if (*tl) {
 				np = VTONFS(vp);
 				nqlflag = fxdr_unsigned(int, *tl);
-				nfsm_dissect(tl, u_long *, 4*NFSX_UNSIGNED);
+				nfsm_dissect(tl, u_int32_t *, 4*NFSX_UNSIGNED);
 				cachable = fxdr_unsigned(int, *tl++);
 				reqtime += fxdr_unsigned(int, *tl++);
 				if (reqtime > time_second) {
@@ -1170,7 +1170,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 	struct mbuf **mbp;
 	caddr_t *bposp;
 {
-	register u_long *tl;
+	register u_int32_t *tl;
 	register struct mbuf *mreq;
 	caddr_t bpos;
 	struct mbuf *mb, *mb2;
@@ -1186,7 +1186,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 		MCLGET(mreq, M_WAIT);
 	} else
 		mreq->m_data += max_hdr;
-	tl = mtod(mreq, u_long *);
+	tl = mtod(mreq, u_int32_t *);
 	mreq->m_len = 6 * NFSX_UNSIGNED;
 	bpos = ((caddr_t)tl) + mreq->m_len;
 	*tl++ = txdr_unsigned(nd->nd_retxid);
@@ -1238,7 +1238,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 			*tl++ = rpc_auth_kerb;
 			*tl++ = txdr_unsigned(3 * NFSX_UNSIGNED);
 			*tl = ktvout.tv_sec;
-			nfsm_build(tl, u_long *, 3 * NFSX_UNSIGNED);
+			nfsm_build(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 			*tl++ = ktvout.tv_usec;
 			*tl++ = txdr_unsigned(nuidp->nu_cr.cr_uid);
 		    } else {
@@ -1255,7 +1255,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 			break;
 		case EPROGMISMATCH:
 			*tl = txdr_unsigned(RPC_PROGMISMATCH);
-			nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+			nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			if (nd->nd_flag & ND_NQNFS) {
 				*tl++ = txdr_unsigned(3);
 				*tl = txdr_unsigned(3);
@@ -1273,7 +1273,7 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 		default:
 			*tl = 0;
 			if (err != NFSERR_RETVOID) {
-				nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+				nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 				if (err)
 				    *tl = txdr_unsigned(nfsrv_errmap(nd, err));
 				else
@@ -1288,13 +1288,13 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
 	 */
 	if ((nd->nd_flag & ND_NQNFS) && err == 0) {
 		if (nd->nd_flag & ND_LEASE) {
-			nfsm_build(tl, u_long *, 5 * NFSX_UNSIGNED);
+			nfsm_build(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
 			*tl++ = txdr_unsigned(nd->nd_flag & ND_LEASE);
 			*tl++ = txdr_unsigned(cache);
 			*tl++ = txdr_unsigned(nd->nd_duration);
 			txdr_hyper(frev, tl);
 		} else {
-			nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+			nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 			*tl = 0;
 		}
 	}
@@ -1679,12 +1679,12 @@ nfs_getreq(nd, nfsd, has_header)
 	int has_header;
 {
 	register int len, i;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	struct uio uio;
 	struct iovec iov;
 	caddr_t dpos, cp2, cp;
-	u_long nfsvers, auth_type;
+	u_int32_t nfsvers, auth_type;
 	uid_t nickuid;
 	int error = 0, nqnfs = 0, ticklen;
 	struct mbuf *mrep, *md;
@@ -1698,14 +1698,14 @@ nfs_getreq(nd, nfsd, has_header)
 	md = nd->nd_md;
 	dpos = nd->nd_dpos;
 	if (has_header) {
-		nfsm_dissect(tl, u_long *, 10 * NFSX_UNSIGNED);
-		nd->nd_retxid = fxdr_unsigned(u_long, *tl++);
+		nfsm_dissect(tl, u_int32_t *, 10 * NFSX_UNSIGNED);
+		nd->nd_retxid = fxdr_unsigned(u_int32_t, *tl++);
 		if (*tl++ != rpc_call) {
 			m_freem(mrep);
 			return (EBADRPC);
 		}
 	} else
-		nfsm_dissect(tl, u_long *, 8 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 8 * NFSX_UNSIGNED);
 	nd->nd_repstat = 0;
 	nd->nd_flag = 0;
 	if (*tl++ != rpc_vers) {
@@ -1723,7 +1723,7 @@ nfs_getreq(nd, nfsd, has_header)
 		}
 	}
 	tl++;
-	nfsvers = fxdr_unsigned(u_long, *tl++);
+	nfsvers = fxdr_unsigned(u_int32_t, *tl++);
 	if (((nfsvers < NFS_VER2 || nfsvers > NFS_VER3) && !nqnfs) ||
 		(nfsvers != NQNFS_VER3 && nqnfs)) {
 		nd->nd_repstat = EPROGMISMATCH;
@@ -1734,7 +1734,7 @@ nfs_getreq(nd, nfsd, has_header)
 		nd->nd_flag = (ND_NFSV3 | ND_NQNFS);
 	else if (nfsvers == NFS_VER3)
 		nd->nd_flag = ND_NFSV3;
-	nd->nd_procnum = fxdr_unsigned(u_long, *tl++);
+	nd->nd_procnum = fxdr_unsigned(u_int32_t, *tl++);
 	if (nd->nd_procnum == NFSPROC_NULL)
 		return (0);
 	if (nd->nd_procnum >= NFS_NPROCS ||
@@ -1764,7 +1764,7 @@ nfs_getreq(nd, nfsd, has_header)
 			return (EBADRPC);
 		}
 		nfsm_adv(nfsm_rndup(len));
-		nfsm_dissect(tl, u_long *, 3 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 		bzero((caddr_t)&nd->nd_cr, sizeof (struct ucred));
 		nd->nd_cr.cr_ref = 1;
 		nd->nd_cr.cr_uid = fxdr_unsigned(uid_t, *tl++);
@@ -1774,7 +1774,7 @@ nfs_getreq(nd, nfsd, has_header)
 			m_freem(mrep);
 			return (EBADRPC);
 		}
-		nfsm_dissect(tl, u_long *, (len + 2) * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, (len + 2) * NFSX_UNSIGNED);
 		for (i = 1; i <= len; i++)
 		    if (i < NGROUPS)
 			nd->nd_cr.cr_groups[i] = fxdr_unsigned(gid_t, *tl++);
@@ -1794,7 +1794,7 @@ nfs_getreq(nd, nfsd, has_header)
 		switch (fxdr_unsigned(int, *tl++)) {
 		case RPCAKN_FULLNAME:
 			ticklen = fxdr_unsigned(int, *tl);
-			*((u_long *)nfsd->nfsd_authstr) = *tl;
+			*((u_int32_t *)nfsd->nfsd_authstr) = *tl;
 			uio.uio_resid = nfsm_rndup(ticklen) + NFSX_UNSIGNED;
 			nfsd->nfsd_authlen = uio.uio_resid + NFSX_UNSIGNED;
 			if (uio.uio_resid > (len - 2 * NFSX_UNSIGNED)) {
@@ -1808,7 +1808,7 @@ nfs_getreq(nd, nfsd, has_header)
 			iov.iov_base = (caddr_t)&nfsd->nfsd_authstr[4];
 			iov.iov_len = RPCAUTH_MAXSIZ - 4;
 			nfsm_mtouio(&uio, uio.uio_resid);
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			if (*tl++ != rpc_auth_kerb ||
 				fxdr_unsigned(int, *tl) != 4 * NFSX_UNSIGNED) {
 				printf("Bad kerb verifier\n");
@@ -1817,7 +1817,7 @@ nfs_getreq(nd, nfsd, has_header)
 				return (0);
 			}
 			nfsm_dissect(cp, caddr_t, 4 * NFSX_UNSIGNED);
-			tl = (u_long *)cp;
+			tl = (u_int32_t *)cp;
 			if (fxdr_unsigned(int, *tl) != RPCAKN_FULLNAME) {
 				printf("Not fullname kerb verifier\n");
 				nd->nd_repstat = (NFSERR_AUTHERR|AUTH_BADVERF);
@@ -1838,7 +1838,7 @@ nfs_getreq(nd, nfsd, has_header)
 				return (0);
 			}
 			nickuid = fxdr_unsigned(uid_t, *tl);
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			if (*tl++ != rpc_auth_kerb ||
 				fxdr_unsigned(int, *tl) != 3 * NFSX_UNSIGNED) {
 				printf("Kerb nick verifier bad\n");
@@ -1846,7 +1846,7 @@ nfs_getreq(nd, nfsd, has_header)
 				nd->nd_procnum = NFSPROC_NOOP;
 				return (0);
 			}
-			nfsm_dissect(tl, u_long *, 3 * NFSX_UNSIGNED);
+			nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 			tvin.tv_sec = *tl++;
 			tvin.tv_usec = *tl;
 
@@ -1898,11 +1898,11 @@ nfs_getreq(nd, nfsd, has_header)
 	 * For nqnfs, get piggybacked lease request.
 	 */
 	if (nqnfs && nd->nd_procnum != NQNFSPROC_EVICTED) {
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
 		nd->nd_flag |= fxdr_unsigned(int, *tl);
 		if (nd->nd_flag & ND_LEASE) {
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED);
-			nd->nd_duration = fxdr_unsigned(int, *tl);
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED);
+			nd->nd_duration = fxdr_unsigned(int32_t, *tl);
 		} else
 			nd->nd_duration = NQ_MINLEASE;
 	} else
@@ -2066,7 +2066,7 @@ nfsrv_getstream(slp, waitflag)
 	register char *cp1, *cp2;
 	register int len;
 	struct mbuf *om, *m2, *recm = NULL;
-	u_long recmark;
+	u_int32_t recmark;
 
 	if (slp->ns_flag & SLP_GETSTREAM)
 		panic("nfs getstream");
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 630698e..b53f59d 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.59 1998/05/31 18:11:03 peter Exp $
+ * $Id: nfs_subs.c,v 1.60 1998/05/31 19:16:08 peter Exp $
  */
 
 /*
@@ -83,14 +83,14 @@
  * Data items converted to xdr at startup, since they are constant
  * This is kinda hokey, but may save a little time doing byte swaps
  */
-u_long nfs_xdrneg1;
-u_long rpc_call, rpc_vers, rpc_reply, rpc_msgdenied, rpc_autherr,
+u_int32_t nfs_xdrneg1;
+u_int32_t rpc_call, rpc_vers, rpc_reply, rpc_msgdenied, rpc_autherr,
 	rpc_mismatch, rpc_auth_unix, rpc_msgaccepted,
 	rpc_auth_kerb;
-u_long nfs_prog, nqnfs_prog, nfs_true, nfs_false;
+u_int32_t nfs_prog, nqnfs_prog, nfs_true, nfs_false;
 
 /* And other global data */
-static u_long nfs_xid = 0;
+static u_int32_t nfs_xid = 0;
 static enum vtype nv2tov_type[8]= {
 	VNON, VREG, VDIR, VBLK, VCHR, VLNK, VNON,  VNON 
 };
@@ -580,7 +580,7 @@ nfsm_reqh(vp, procid, hsiz, bposp)
 	caddr_t *bposp;
 {
 	register struct mbuf *mb;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register caddr_t bpos;
 	struct mbuf *mb2;
 	struct nfsmount *nmp;
@@ -600,11 +600,11 @@ nfsm_reqh(vp, procid, hsiz, bposp)
 		if (nmp->nm_flag & NFSMNT_NQNFS) {
 			nqflag = NQNFS_NEEDLEASE(vp, procid);
 			if (nqflag) {
-				nfsm_build(tl, u_long *, 2*NFSX_UNSIGNED);
+				nfsm_build(tl, u_int32_t *, 2*NFSX_UNSIGNED);
 				*tl++ = txdr_unsigned(nqflag);
 				*tl = txdr_unsigned(nmp->nm_leaseterm);
 			} else {
-				nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+				nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 				*tl = 0;
 			}
 		}
@@ -634,15 +634,15 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
 	struct mbuf *mrest;
 	int mrest_len;
 	struct mbuf **mbp;
-	u_long *xidp;
+	u_int32_t *xidp;
 {
 	register struct mbuf *mb;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register caddr_t bpos;
 	register int i;
 	struct mbuf *mreq, *mb2;
 	int siz, grpsiz, authsiz;
-	static u_long base;
+	static u_int32_t base;
 
 	authsiz = nfsm_rndup(auth_len);
 	MGETHDR(mb, M_WAIT, MT_DATA);
@@ -660,7 +660,7 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
 	/*
 	 * First the RPC header.
 	 */
-	nfsm_build(tl, u_long *, 8 * NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, 8 * NFSX_UNSIGNED);
 
 	/* Get a pretty random xid to start with */
 	if (!nfs_xid) 
@@ -696,7 +696,7 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
 	*tl = txdr_unsigned(authsiz);
 	switch (auth_type) {
 	case RPCAUTH_UNIX:
-		nfsm_build(tl, u_long *, auth_len);
+		nfsm_build(tl, u_int32_t *, auth_len);
 		*tl++ = 0;		/* stamp ?? */
 		*tl++ = 0;		/* NULL hostname */
 		*tl++ = txdr_unsigned(cr->cr_uid);
@@ -736,7 +736,7 @@ nfsm_rpchead(cr, nmflag, procid, auth_type, auth_len, auth_str, verf_len,
 	/*
 	 * And the verifier...
 	 */
-	nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 	if (verf_str) {
 		*tl++ = txdr_unsigned(RPCAUTH_KERB4);
 		*tl = txdr_unsigned(verf_len);
@@ -1038,14 +1038,14 @@ nfsm_strtmbuf(mb, bpos, cp, siz)
 {
 	register struct mbuf *m1 = NULL, *m2;
 	long left, xfer, len, tlen;
-	u_long *tl;
+	u_int32_t *tl;
 	int putsize;
 
 	putsize = 1;
 	m2 = *mb;
 	left = M_TRAILINGSPACE(m2);
 	if (left > 0) {
-		tl = ((u_long *)(*bpos));
+		tl = ((u_int32_t *)(*bpos));
 		*tl++ = txdr_unsigned(siz);
 		putsize = 0;
 		left -= NFSX_UNSIGNED;
@@ -1066,7 +1066,7 @@ nfsm_strtmbuf(mb, bpos, cp, siz)
 		m1->m_len = NFSMSIZ(m1);
 		m2->m_next = m1;
 		m2 = m1;
-		tl = mtod(m1, u_long *);
+		tl = mtod(m1, u_int32_t *);
 		tlen = 0;
 		if (putsize) {
 			*tl++ = txdr_unsigned(siz);
@@ -1207,7 +1207,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	register struct vattr *vap;
 	register struct nfs_fattr *fp;
 	register struct nfsnode *np;
-	register long t1;
+	register int32_t t1;
 	caddr_t cp2;
 	int error = 0, rdev;
 	struct mbuf *md;
@@ -1252,7 +1252,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		 */
 		if (vtyp == VNON || (vtyp == VREG && (vmode & S_IFMT) != 0))
 			vtyp = IFTOVT(vmode);
-		rdev = fxdr_unsigned(long, fp->fa2_rdev);
+		rdev = fxdr_unsigned(int32_t, fp->fa2_rdev);
 		fxdr_nfsv2time(&fp->fa2_mtime, &mtime);
 
 		/*
@@ -1313,7 +1313,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		fxdr_hyper(&fp->fa3_size, &vap->va_size);
 		vap->va_blocksize = NFS_FABLKSIZE;
 		fxdr_hyper(&fp->fa3_used, &vap->va_bytes);
-		vap->va_fileid = fxdr_unsigned(int, fp->fa3_fileid.nfsuquad[1]);
+		vap->va_fileid = fxdr_unsigned(int32_t,
+		    fp->fa3_fileid.nfsuquad[1]);
 		fxdr_nfsv3time(&fp->fa3_atime, &vap->va_atime);
 		fxdr_nfsv3time(&fp->fa3_ctime, &vap->va_ctime);
 		vap->va_flags = 0;
@@ -1322,15 +1323,17 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		vap->va_nlink = fxdr_unsigned(u_short, fp->fa_nlink);
 		vap->va_uid = fxdr_unsigned(uid_t, fp->fa_uid);
 		vap->va_gid = fxdr_unsigned(gid_t, fp->fa_gid);
-		vap->va_size = fxdr_unsigned(u_long, fp->fa2_size);
-		vap->va_blocksize = fxdr_unsigned(long, fp->fa2_blocksize);
-		vap->va_bytes = fxdr_unsigned(long, fp->fa2_blocks) * NFS_FABLKSIZE;
-		vap->va_fileid = fxdr_unsigned(long, fp->fa2_fileid);
+		vap->va_size = fxdr_unsigned(u_int32_t, fp->fa2_size);
+		vap->va_blocksize = fxdr_unsigned(int32_t, fp->fa2_blocksize);
+		vap->va_bytes = fxdr_unsigned(int32_t, fp->fa2_blocks)
+		    * NFS_FABLKSIZE;
+		vap->va_fileid = fxdr_unsigned(int32_t, fp->fa2_fileid);
 		fxdr_nfsv2time(&fp->fa2_atime, &vap->va_atime);
 		vap->va_flags = 0;
-		vap->va_ctime.tv_sec = fxdr_unsigned(long, fp->fa2_ctime.nfsv2_sec);
+		vap->va_ctime.tv_sec = fxdr_unsigned(u_int32_t,
+		    fp->fa2_ctime.nfsv2_sec);
 		vap->va_ctime.tv_nsec = 0;
-		vap->va_gen = fxdr_unsigned(u_long, fp->fa2_ctime.nfsv2_usec);
+		vap->va_gen = fxdr_unsigned(u_int32_t,fp->fa2_ctime.nfsv2_usec);
 		vap->va_filerev = 0;
 	}
 	if (vap->va_size != np->n_size) {
@@ -1763,13 +1766,13 @@ nfsm_srvwcc(nfsd, before_ret, before_vap, after_ret, after_vap, mbp, bposp)
 {
 	register struct mbuf *mb = *mbp, *mb2;
 	register char *bpos = *bposp;
-	register u_long *tl;
+	register u_int32_t *tl;
 
 	if (before_ret) {
-		nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 		*tl = nfs_false;
 	} else {
-		nfsm_build(tl, u_long *, 7 * NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, 7 * NFSX_UNSIGNED);
 		*tl++ = nfs_true;
 		txdr_hyper(&(before_vap->va_size), tl);
 		tl += 2;
@@ -1792,14 +1795,14 @@ nfsm_srvpostopattr(nfsd, after_ret, after_vap, mbp, bposp)
 {
 	register struct mbuf *mb = *mbp, *mb2;
 	register char *bpos = *bposp;
-	register u_long *tl;
+	register u_int32_t *tl;
 	register struct nfs_fattr *fp;
 
 	if (after_ret) {
-		nfsm_build(tl, u_long *, NFSX_UNSIGNED);
+		nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED);
 		*tl = nfs_false;
 	} else {
-		nfsm_build(tl, u_long *, NFSX_UNSIGNED + NFSX_V3FATTR);
+		nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED + NFSX_V3FATTR);
 		*tl++ = nfs_true;
 		fp = (struct nfs_fattr *)tl;
 		nfsm_srvfattr(nfsd, after_vap, fp);
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 2f07161..08a1f13 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.39 1998/05/31 17:27:53 peter Exp $
+ * $Id: nfs_syscalls.c,v 1.40 1998/05/31 18:46:06 peter Exp $
  */
 
 #include <sys/param.h>
@@ -75,7 +75,7 @@
 static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure");
 
 /* Global defs. */
-extern int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd,
+extern int32_t (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *nd,
 					    struct nfssvc_sock *slp,
 					    struct proc *procp,
 					    struct mbuf **mreqp));
@@ -401,15 +401,15 @@ nfssvc_addsock(fp, mynam, p)
 	 */
 	if (so->so_type == SOCK_STREAM) {
 		MGET(m, M_WAIT, MT_SOOPTS);
-		*mtod(m, int *) = 1;
-		m->m_len = sizeof(int);
+		*mtod(m, int32_t *) = 1;
+		m->m_len = sizeof(int32_t);
 		sosetopt(so, SOL_SOCKET, SO_KEEPALIVE, m, p);
 	}
 	if (so->so_proto->pr_domain->dom_family == AF_INET &&
 	    so->so_proto->pr_protocol == IPPROTO_TCP) {
 		MGET(m, M_WAIT, MT_SOOPTS);
-		*mtod(m, int *) = 1;
-		m->m_len = sizeof(int);
+		*mtod(m, int32_t *) = 1;
+		m->m_len = sizeof(int32_t);
 		sosetopt(so, IPPROTO_TCP, TCP_NODELAY, m, p);
 	}
 	so->so_rcv.sb_flags &= ~SB_NOINTR;
@@ -677,7 +677,7 @@ nfssvc_nfsd(nsd, argp, p)
 			 */
 			if (sotype == SOCK_STREAM) {
 				M_PREPEND(m, NFSX_UNSIGNED, M_WAIT);
-				*mtod(m, u_long *) = htonl(0x80000000 | siz);
+				*mtod(m, u_int32_t *) = htonl(0x80000000 | siz);
 			}
 			if (solockp)
 				(void) nfs_sndlock(solockp, solockp, 
@@ -1064,7 +1064,7 @@ nfs_getnickauth(nmp, cred, auth_str, auth_len, verf_str, verf_len)
 	int verf_len;
 {
 	register struct nfsuid *nuidp;
-	register u_long *nickp, *verfp;
+	register u_int32_t *nickp, *verfp;
 	struct timeval ktvin, ktvout;
 
 #ifdef DIAGNOSTIC
@@ -1085,7 +1085,7 @@ nfs_getnickauth(nmp, cred, auth_str, auth_len, verf_str, verf_len)
 	TAILQ_REMOVE(&nmp->nm_uidlruhead, nuidp, nu_lru);
 	TAILQ_INSERT_TAIL(&nmp->nm_uidlruhead, nuidp, nu_lru);
 
-	nickp = (u_long *)malloc(2 * NFSX_UNSIGNED, M_TEMP, M_WAITOK);
+	nickp = (u_int32_t *)malloc(2 * NFSX_UNSIGNED, M_TEMP, M_WAITOK);
 	*nickp++ = txdr_unsigned(RPCAKN_NICKNAME);
 	*nickp = txdr_unsigned(nuidp->nu_nickname);
 	*auth_str = (char *)nickp;
@@ -1094,7 +1094,7 @@ nfs_getnickauth(nmp, cred, auth_str, auth_len, verf_str, verf_len)
 	/*
 	 * Now we must encrypt the verifier and package it up.
 	 */
-	verfp = (u_long *)verf_str;
+	verfp = (u_int32_t *)verf_str;
 	*verfp++ = txdr_unsigned(RPCAKN_NICKNAME);
 	if (time_second > nuidp->nu_timestamp.tv_sec ||
 	    (time_second == nuidp->nu_timestamp.tv_sec &&
@@ -1133,19 +1133,19 @@ nfs_savenickauth(nmp, cred, len, key, mdp, dposp, mrep)
 	struct mbuf *mrep;
 {
 	register struct nfsuid *nuidp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	struct mbuf *md = *mdp;
 	struct timeval ktvin, ktvout;
-	u_long nick;
+	u_int32_t nick;
 	char *dpos = *dposp, *cp2;
 	int deltasec, error = 0;
 
 	if (len == (3 * NFSX_UNSIGNED)) {
-		nfsm_dissect(tl, u_long *, 3 * NFSX_UNSIGNED);
+		nfsm_dissect(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
 		ktvin.tv_sec = *tl++;
 		ktvin.tv_usec = *tl++;
-		nick = fxdr_unsigned(u_long, *tl);
+		nick = fxdr_unsigned(u_int32_t, *tl);
 
 		/*
 		 * Decrypt the timestamp in ecb mode.
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index bb254a2..75158ed 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.19 1998/05/31 18:19:43 peter Exp $
+ * $Id: nfsm_subs.h,v 1.20 1998/05/31 19:00:19 peter Exp $
  */
 
 
@@ -59,7 +59,7 @@ struct mbuf *nfsm_rpchead __P((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_long *xidp));
+			       struct mbuf **mbp, u_int32_t *xidp));
 
 #define	M_HASCL(m)	((m)->m_flags & M_EXT)
 #define	NFSMINOFF(m) \
@@ -117,7 +117,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 	      { if (v3) { \
 			t2 = nfsm_rndup(VTONFS(v)->n_fhsize) + NFSX_UNSIGNED; \
 			if (t2 <= M_TRAILINGSPACE(mb)) { \
-				nfsm_build(tl, u_long *, t2); \
+				nfsm_build(tl, u_int32_t *, t2); \
 				*tl++ = txdr_unsigned(VTONFS(v)->n_fhsize); \
 				*(tl + ((t2>>2) - 2)) = 0; \
 				bcopy((caddr_t)VTONFS(v)->n_fhp,(caddr_t)tl, \
@@ -136,7 +136,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 
 #define nfsm_srvfhtom(f, v3) \
 		{ if (v3) { \
-			nfsm_build(tl, u_long *, NFSX_UNSIGNED + NFSX_V3FH); \
+			nfsm_build(tl, u_int32_t *, NFSX_UNSIGNED + NFSX_V3FH); \
 			*tl++ = txdr_unsigned(NFSX_V3FH); \
 			bcopy((caddr_t)(f), (caddr_t)tl, NFSX_V3FH); \
 		} else { \
@@ -145,7 +145,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 		} }
 
 #define nfsm_srvpostop_fh(f) \
-		{ nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED + NFSX_V3FH); \
+		{ nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED + NFSX_V3FH); \
 		*tl++ = nfs_true; \
 		*tl++ = txdr_unsigned(NFSX_V3FH); \
 		bcopy((caddr_t)(f), (caddr_t)tl, NFSX_V3FH); \
@@ -154,7 +154,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 #define nfsm_mtofh(d, v, v3, f) \
 		{ struct nfsnode *ttnp; nfsfh_t *ttfhp; int ttfhsize; \
 		if (v3) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			(f) = fxdr_unsigned(int, *tl); \
 		} else \
 			(f) = 1; \
@@ -169,7 +169,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			(v) = NFSTOV(ttnp); \
 		} \
 		if (v3) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			if (f) \
 				(f) = fxdr_unsigned(int, *tl); \
 			else if (fxdr_unsigned(int, *tl)) \
@@ -181,7 +181,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 
 #define nfsm_getfh(f, s, v3) \
 		{ if (v3) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			if (((s) = fxdr_unsigned(int, *tl)) <= 0 || \
 				(s) > NFSX_V3FHMAX) { \
 				m_freem(mrep); \
@@ -203,8 +203,8 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 
 #define	nfsm_postop_attr(v, f) \
 		{ struct vnode *ttvp = (v); \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
-		if ((f) = fxdr_unsigned(int, *tl)) { \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
+		if (((f) = fxdr_unsigned(int, *tl)) != 0) { \
 			if ((t1 = nfs_loadattrcache(&ttvp, &md, &dpos, \
 				(struct vattr *)0)) != 0) { \
 				error = t1; \
@@ -221,12 +221,12 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 
 #define	nfsm_wcc_data(v, f) \
 		{ int ttattrf, ttretf = 0; \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		if (*tl == nfs_true) { \
-			nfsm_dissect(tl, u_long *, 6 * NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, 6 * NFSX_UNSIGNED); \
 			if (f) \
 				ttretf = (VTONFS(v)->n_mtime == \
-					fxdr_unsigned(u_long, *(tl + 2))); \
+					fxdr_unsigned(u_int32_t, *(tl + 2))); \
 		} \
 		nfsm_postop_attr((v), ttattrf); \
 		if (f) { \
@@ -248,23 +248,23 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 		}
 
 #define	nfsm_strsiz(s,m) \
-		{ nfsm_dissect(tl,u_long *,NFSX_UNSIGNED); \
-		if (((s) = fxdr_unsigned(long,*tl)) > (m)) { \
+		{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \
+		if (((s) = fxdr_unsigned(int32_t,*tl)) > (m)) { \
 			m_freem(mrep); \
 			error = EBADRPC; \
 			goto nfsmout; \
 		} }
 
 #define	nfsm_srvstrsiz(s,m) \
-		{ nfsm_dissect(tl,u_long *,NFSX_UNSIGNED); \
-		if (((s) = fxdr_unsigned(long,*tl)) > (m) || (s) <= 0) { \
+		{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \
+		if (((s) = fxdr_unsigned(int32_t,*tl)) > (m) || (s) <= 0) { \
 			error = EBADRPC; \
 			nfsm_reply(0); \
 		} }
 
 #define	nfsm_srvnamesiz(s) \
-		{ nfsm_dissect(tl,u_long *,NFSX_UNSIGNED); \
-		if (((s) = fxdr_unsigned(long,*tl)) > NFS_MAXNAMLEN) \
+		{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \
+		if (((s) = fxdr_unsigned(int32_t,*tl)) > NFS_MAXNAMLEN) \
 			error = NFSERR_NAMETOL; \
 		if ((s) <= 0) \
 			error = EBADRPC; \
@@ -312,7 +312,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 		} \
 		t2 = nfsm_rndup(s)+NFSX_UNSIGNED; \
 		if (t2 <= M_TRAILINGSPACE(mb)) { \
-			nfsm_build(tl,u_long *,t2); \
+			nfsm_build(tl,u_int32_t *,t2); \
 			*tl++ = txdr_unsigned(s); \
 			*(tl+((t2>>2)-2)) = 0; \
 			bcopy((const char *)(a), (caddr_t)tl, (s)); \
@@ -369,7 +369,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 #define nfsm_srvmtofh(f) \
 	{ int fhlen = NFSX_V3FH; \
 		if (nfsd->nd_flag & ND_NFSV3) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			fhlen = fxdr_unsigned(int, *tl); \
 			if (fhlen == 0) { \
 				bzero((caddr_t)(f), NFSX_V3FH); \
@@ -379,7 +379,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			} \
 		} \
 		if (fhlen != 0) { \
-			nfsm_dissect(tl, u_long *, NFSX_V3FH); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_V3FH); \
 			bcopy((caddr_t)tl, (caddr_t)(f), NFSX_V3FH); \
 			if ((nfsd->nd_flag & ND_NFSV3) == 0) \
 				nfsm_adv(NFSX_V2FH - NFSX_V3FH); \
@@ -398,7 +398,7 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 			bp = mtod(mp, caddr_t); \
 			be = bp+mp->m_len; \
 		} \
-		tl = (u_long *)bp
+		tl = (u_int32_t *)bp
 
 #define	nfsm_srvfillattr(a, f) \
 		nfsm_srvfattr(nfsd, (a), (f))
@@ -410,40 +410,40 @@ struct mbuf *nfsm_rpchead __P((struct ucred *cr, int nmflag, int procid,
 		nfsm_srvpostopattr(nfsd, (r), (a), &mb, &bpos)
 
 #define nfsm_srvsattr(a) \
-		{ nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		{ nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		if (*tl == nfs_true) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			(a)->va_mode = nfstov_mode(*tl); \
 		} \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		if (*tl == nfs_true) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			(a)->va_uid = fxdr_unsigned(uid_t, *tl); \
 		} \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		if (*tl == nfs_true) { \
-			nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 			(a)->va_gid = fxdr_unsigned(gid_t, *tl); \
 		} \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		if (*tl == nfs_true) { \
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED); \
 			fxdr_hyper(tl, &(a)->va_size); \
 		} \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		switch (fxdr_unsigned(int, *tl)) { \
 		case NFSV3SATTRTIME_TOCLIENT: \
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED); \
 			fxdr_nfsv3time(tl, &(a)->va_atime); \
 			break; \
 		case NFSV3SATTRTIME_TOSERVER: \
 			getnanotime(&(a)->va_atime); \
 			break; \
 		}; \
-		nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); \
+		nfsm_dissect(tl, u_int32_t *, NFSX_UNSIGNED); \
 		switch (fxdr_unsigned(int, *tl)) { \
 		case NFSV3SATTRTIME_TOCLIENT: \
-			nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED); \
+			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED); \
 			fxdr_nfsv3time(tl, &(a)->va_mtime); \
 			break; \
 		case NFSV3SATTRTIME_TOSERVER: \
diff --git a/sys/nfsserver/nfsproto.h b/sys/nfsserver/nfsproto.h
index 9ada127..665a187 100644
--- a/sys/nfsserver/nfsproto.h
+++ b/sys/nfsserver/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.4 1998/05/31 17:27:58 peter Exp $
+ * $Id: nfsproto.h,v 1.5 1998/05/31 19:00:19 peter Exp $
  */
 
 #ifndef _NFS_NFSPROTO_H_
@@ -230,12 +230,12 @@
 #define	vtonfsv2_mode(t,m) \
 		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : \
 				MAKEIMODE((t), (m)))
-#define vtonfsv3_mode(m)	txdr_unsigned((m) & 07777)
-#define	nfstov_mode(a)		(fxdr_unsigned(u_short, (a))&07777)
-#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((long)(a))])
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((long)(a))])
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_long,(a))&0x7]
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_long,(a))&0x7]
+#define vtonfsv3_mode(m)	txdr_unsigned((m) & ALLPERMS)
+#define	nfstov_mode(a)		(fxdr_unsigned(u_int32_t, (a)) & ALLPERMS)
+#define	vtonfsv2_type(a)	txdr_unsigned(nfsv2_type[((int32_t)(a))])
+#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((int32_t)(a))])
+#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(u_int32_t,(a))&0x7]
+#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(u_int32_t,(a))&0x7]
 
 /* File types */
 typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
@@ -259,14 +259,14 @@ union nfsfh {
 typedef union nfsfh nfsfh_t;
 
 struct nfsv2_time {
-	u_long	nfsv2_sec;
-	u_long	nfsv2_usec;
+	u_int32_t	nfsv2_sec;
+	u_int32_t	nfsv2_usec;
 };
 typedef struct nfsv2_time	nfstime2;
 
 struct nfsv3_time {
-	u_long	nfsv3_sec;
-	u_long	nfsv3_nsec;
+	u_int32_t	nfsv3_sec;
+	u_int32_t	nfsv3_nsec;
 };
 typedef struct nfsv3_time	nfstime3;
 
@@ -275,7 +275,7 @@ typedef struct nfsv3_time	nfstime3;
  * protocol and to facilitate xdr conversion.
  */
 struct nfs_uquad {
-	u_long	nfsuquad[2];
+	u_int32_t	nfsuquad[2];
 };
 typedef	struct nfs_uquad	nfsuint64;
 
@@ -283,7 +283,7 @@ typedef	struct nfs_uquad	nfsuint64;
  * Used to convert between two u_longs and a u_quad_t.
  */
 union nfs_quadconvert {
-	u_long		lval[2];
+	u_int32_t	lval[2];
 	u_quad_t	qval;
 };
 typedef union nfs_quadconvert	nfsquad_t;
@@ -292,8 +292,8 @@ typedef union nfs_quadconvert	nfsquad_t;
  * NFS Version 3 special file number.
  */
 struct nfsv3_spec {
-	u_long	specdata1;
-	u_long	specdata2;
+	u_int32_t	specdata1;
+	u_int32_t	specdata2;
 };
 typedef	struct nfsv3_spec	nfsv3spec;
 
@@ -307,19 +307,19 @@ typedef	struct nfsv3_spec	nfsv3spec;
  *     NFSX_FATTR(v3) macro.
  */
 struct nfs_fattr {
-	u_long	fa_type;
-	u_long	fa_mode;
-	u_long	fa_nlink;
-	u_long	fa_uid;
-	u_long	fa_gid;
+	u_int32_t	fa_type;
+	u_int32_t	fa_mode;
+	u_int32_t	fa_nlink;
+	u_int32_t	fa_uid;
+	u_int32_t	fa_gid;
 	union {
 		struct {
-			u_long		nfsv2fa_size;
-			u_long		nfsv2fa_blocksize;
-			u_long		nfsv2fa_rdev;
-			u_long		nfsv2fa_blocks;
-			u_long		nfsv2fa_fsid;
-			u_long		nfsv2fa_fileid;
+			u_int32_t	nfsv2fa_size;
+			u_int32_t	nfsv2fa_blocksize;
+			u_int32_t	nfsv2fa_rdev;
+			u_int32_t	nfsv2fa_blocks;
+			u_int32_t	nfsv2fa_fsid;
+			u_int32_t	nfsv2fa_fileid;
 			nfstime2	nfsv2fa_atime;
 			nfstime2	nfsv2fa_mtime;
 			nfstime2	nfsv2fa_ctime;
@@ -357,10 +357,10 @@ struct nfs_fattr {
 #define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
 
 struct nfsv2_sattr {
-	u_long		sa_mode;
-	u_long		sa_uid;
-	u_long		sa_gid;
-	u_long		sa_size;
+	u_int32_t	sa_mode;
+	u_int32_t	sa_uid;
+	u_int32_t	sa_gid;
+	u_int32_t	sa_size;
 	nfstime2	sa_atime;
 	nfstime2	sa_mtime;
 };
@@ -369,25 +369,25 @@ struct nfsv2_sattr {
  * NFS Version 3 sattr structure for the new node creation case.
  */
 struct nfsv3_sattr {
-	u_long		sa_modetrue;
-	u_long		sa_mode;
-	u_long		sa_uidfalse;
-	u_long		sa_gidfalse;
-	u_long		sa_sizefalse;
-	u_long		sa_atimetype;
+	u_int32_t	sa_modetrue;
+	u_int32_t	sa_mode;
+	u_int32_t	sa_uidfalse;
+	u_int32_t	sa_gidfalse;
+	u_int32_t	sa_sizefalse;
+	u_int32_t	sa_atimetype;
 	nfstime3	sa_atime;
-	u_long		sa_mtimetype;
+	u_int32_t	sa_mtimetype;
 	nfstime3	sa_mtime;
 };
 
 struct nfs_statfs {
 	union {
 		struct {
-			u_long		nfsv2sf_tsize;
-			u_long		nfsv2sf_bsize;
-			u_long		nfsv2sf_blocks;
-			u_long		nfsv2sf_bfree;
-			u_long		nfsv2sf_bavail;
+			u_int32_t	nfsv2sf_tsize;
+			u_int32_t	nfsv2sf_bsize;
+			u_int32_t	nfsv2sf_blocks;
+			u_int32_t	nfsv2sf_bfree;
+			u_int32_t	nfsv2sf_bavail;
 		} sf_nfsv2;
 		struct {
 			nfsuint64	nfsv3sf_tbytes;
@@ -396,7 +396,7 @@ struct nfs_statfs {
 			nfsuint64	nfsv3sf_tfiles;
 			nfsuint64	nfsv3sf_ffiles;
 			nfsuint64	nfsv3sf_afiles;
-			u_long		nfsv3sf_invarsec;
+			u_int32_t	nfsv3sf_invarsec;
 		} sf_nfsv3;
 	} sf_un;
 };
@@ -415,25 +415,25 @@ struct nfs_statfs {
 #define sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
 
 struct nfsv3_fsinfo {
-	u_long		fs_rtmax;
-	u_long		fs_rtpref;
-	u_long		fs_rtmult;
-	u_long		fs_wtmax;
-	u_long		fs_wtpref;
-	u_long		fs_wtmult;
-	u_long		fs_dtpref;
+	u_int32_t	fs_rtmax;
+	u_int32_t	fs_rtpref;
+	u_int32_t	fs_rtmult;
+	u_int32_t	fs_wtmax;
+	u_int32_t	fs_wtpref;
+	u_int32_t	fs_wtmult;
+	u_int32_t	fs_dtpref;
 	nfsuint64	fs_maxfilesize;
 	nfstime3	fs_timedelta;
-	u_long		fs_properties;
+	u_int32_t	fs_properties;
 };
 
 struct nfsv3_pathconf {
-	u_long		pc_linkmax;
-	u_long		pc_namemax;
-	u_long		pc_notrunc;
-	u_long		pc_chownrestricted;
-	u_long		pc_caseinsensitive;
-	u_long		pc_casepreserving;
+	u_int32_t	pc_linkmax;
+	u_int32_t	pc_namemax;
+	u_int32_t	pc_notrunc;
+	u_int32_t	pc_chownrestricted;
+	u_int32_t	pc_caseinsensitive;
+	u_int32_t	pc_casepreserving;
 };
 
 #endif
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index b17a022..a05ab31 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsrvcache.h,v 1.9 1997/06/03 17:22:47 dfr Exp $
+ * $Id: nfsrvcache.h,v 1.10 1998/02/03 22:15:04 bde Exp $
  */
 
 
@@ -52,7 +52,7 @@
 struct nfsrvcache {
 	TAILQ_ENTRY(nfsrvcache) rc_lru;		/* LRU chain */
 	LIST_ENTRY(nfsrvcache) rc_hash;		/* Hash chain */
-	u_long	rc_xid;				/* rpc id number */
+	u_int32_t rc_xid;			/* rpc id number */
 	union {
 		struct mbuf *ru_repmb;		/* Reply mbuf list OR */
 		int ru_repstat;			/* Reply status */
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index a9fa37e..784df74 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.38 1998/05/31 17:48:03 peter Exp $
+ * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
  */
 
 #ifndef _NFS_NFS_H_
@@ -204,14 +204,14 @@ struct nfsd_args {
 struct nfsd_srvargs {
 	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
 	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	u_long		nsd_haddr;	/* Ip address of client */
+	u_int32_t	nsd_haddr;	/* Ip address of client */
 	struct ucred	nsd_cr;		/* Cred. uid maps to */
 	int		nsd_authlen;	/* Length of auth string (ret) */
 	u_char		*nsd_authstr;	/* Auth string (ret) */
 	int		nsd_verflen;	/* and the verfier */
 	u_char		*nsd_verfstr;
 	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	u_long		nsd_ttl;	/* credential ttl (sec) */
+	u_int32_t	nsd_ttl;	/* credential ttl (sec) */
 	NFSKERBKEY_T	nsd_key;	/* Session key */
 };
 
@@ -342,7 +342,7 @@ struct nfsreq {
 	caddr_t		r_dpos;
 	struct nfsmount *r_nmp;
 	struct vnode	*r_vp;
-	u_long		r_xid;
+	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 */
@@ -382,7 +382,7 @@ extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
 #define	NFS_WDELAYHASHSIZ 16	/* and with this */
 #endif
 #define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((u_long *)(f))) % NFS_WDELAYHASHSIZ])
+	(&(sock)->ns_wdelayhashtbl[(*((u_int32_t *)(f))) % NFS_WDELAYHASHSIZ])
 #ifndef NFS_MUIDHASHSIZ
 #define NFS_MUIDHASHSIZ	63	/* Tune the size of nfsmount with this */
 #endif
@@ -395,7 +395,7 @@ extern TAILQ_HEAD(nfs_reqq, nfsreq) nfs_reqq;
  * Network address hash list element
  */
 union nethostaddr {
-	u_long had_inetaddr;
+	u_int32_t had_inetaddr;
 	struct sockaddr *had_nam;
 };
 
@@ -407,7 +407,7 @@ struct nfsuid {
 	struct ucred	nu_cr;		/* Cred uid mapped to */
 	int		nu_expire;	/* Expiry time (sec) */
 	struct timeval	nu_timestamp;	/* Kerb. timestamp */
-	u_long		nu_nickname;	/* Nickname on server */
+	u_int32_t	nu_nickname;	/* Nickname on server */
 	NFSKERBKEY_T	nu_key;		/* and session key */
 };
 
@@ -439,7 +439,7 @@ struct nfssvc_sock {
 	int		ns_cc;
 	int		ns_reclen;
 	int		ns_numuids;
-	u_long		ns_sref;
+	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];
@@ -502,8 +502,8 @@ struct nfsrv_descript {
 	int			nd_flag;	/* nd_flag */
 	int			nd_len;		/* Length of this write */
 	int			nd_repstat;	/* Reply status */
-	u_long			nd_retxid;	/* Reply xid */
-	u_long			nd_duration;	/* Lease duration */
+	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 */