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

1 files changed, 28 insertions, 28 deletions

diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 2f8304c..5d15e0e 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.35 1998/05/24 14:41:51 peter Exp $
+ * $Id: nfs_nqlease.c,v 1.36 1998/05/31 17:27:46 peter Exp $
  */
 
 
@@ -91,7 +91,7 @@ extern void	nqnfs_lease_updatetime __P((int deltat));
 static int	nqnfs_vacated __P((struct vnode *vp, struct ucred *cred));
 static void	nqsrv_addhost __P((struct nqhost *lph, struct nfssvc_sock *slp,
 				   struct sockaddr *nam));
-static void	nqsrv_instimeq __P((struct nqlease *lp, u_long duration));
+static void	nqsrv_instimeq __P((struct nqlease *lp, u_int32_t duration));
 static void	nqsrv_locklease __P((struct nqlease *lp));
 static void	nqsrv_send_eviction __P((struct vnode *vp, struct nqlease *lp,
 					 struct nfssvc_sock *slp,
@@ -169,7 +169,7 @@ extern int nfs_mount_type;
 int
 nqsrv_getlease(vp, duration, flags, slp, procp, nam, cachablep, frev, cred)
 	struct vnode *vp;
-	u_long *duration;
+	u_int32_t *duration;
 	int flags;
 	struct nfssvc_sock *slp;
 	struct proc *procp;
@@ -179,8 +179,8 @@ nqsrv_getlease(vp, duration, flags, slp, procp, nam, cachablep, frev, cred)
 	struct ucred *cred;
 {
 	register struct nqlease *lp;
-	register struct nqfhhashhead *lpp = 0;
-	register struct nqhost *lph = 0;
+	register struct nqfhhashhead *lpp = NULL;
+	register struct nqhost *lph = NULL;
 	struct nqlease *tlp;
 	struct nqm **lphp;
 	struct vattr vattr;
@@ -214,7 +214,7 @@ nqsrv_getlease(vp, duration, flags, slp, procp, nam, cachablep, frev, cred)
 			if (fh.fh_fsid.val[0] == lp->lc_fsid.val[0] &&
 			    fh.fh_fsid.val[1] == lp->lc_fsid.val[1] &&
 			    !bcmp(fh.fh_fid.fid_data, lp->lc_fiddata,
-				  fh.fh_fid.fid_len - sizeof (long))) {
+				  fh.fh_fid.fid_len - sizeof (int32_t))) {
 				/* Found it */
 				lp->lc_vp = vp;
 				vp->v_lease = lp;
@@ -312,7 +312,7 @@ doreply:
 	lp->lc_vp = vp;
 	lp->lc_fsid = fh.fh_fsid;
 	bcopy(fh.fh_fid.fid_data, lp->lc_fiddata,
-		fh.fh_fid.fid_len - sizeof (long));
+		fh.fh_fid.fid_len - sizeof (int32_t));
 	if(!lpp)
 		panic("nfs_nqlease.c: Phoney lpp");
 	LIST_INSERT_HEAD(lpp, lp, lc_hash);
@@ -340,7 +340,7 @@ nqnfs_lease_check(vp, p, cred, flag)
 	struct ucred *cred;
 	int flag;
 {
-	u_long duration = 0;
+	u_int32_t duration = 0;
 	int cache;
 	u_quad_t frev;
 
@@ -357,7 +357,7 @@ nqnfs_vop_lease_check(ap)
 		int a_flag;
 	} */ *ap;
 {
-	u_long duration = 0;
+	u_int32_t duration = 0;
 	int cache;
 	u_quad_t frev;
 
@@ -403,7 +403,7 @@ nqsrv_addhost(lph, slp, nam)
 static void
 nqsrv_instimeq(lp, duration)
 	register struct nqlease *lp;
-	u_long duration;
+	u_int32_t duration;
 {
 	register struct nqlease *tlp;
 	time_t newexpiry;
@@ -499,7 +499,7 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	caddr_t bpos, cp;
-	u_long xid, *tl;
+	u_int32_t xid, *tl;
 	int len = 1, ok = 1, i = 0;
 	int sotype, *solockp;
 
@@ -556,7 +556,7 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
 			 */
 			if (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));
 			}
 			if (((lph->lph_flag & (LC_UDP | LC_CLTP)) == 0 &&
@@ -739,8 +739,8 @@ nqnfsrv_getlease(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;
 	u_quad_t frev;
 	caddr_t bpos;
 	int error = 0;
@@ -750,7 +750,7 @@ nqnfsrv_getlease(nfsd, slp, procp, mrq)
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
-	nfsm_dissect(tl, u_long *, 2 * NFSX_UNSIGNED);
+	nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 	flags = fxdr_unsigned(int, *tl++);
 	nfsd->nd_duration = fxdr_unsigned(int, *tl);
 	error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly,
@@ -767,7 +767,7 @@ nqnfsrv_getlease(nfsd, slp, procp, mrq)
 	error = VOP_GETATTR(vp, vap, cred, procp);
 	vput(vp);
 	nfsm_reply(NFSX_V3FATTR + 4 * NFSX_UNSIGNED);
-	nfsm_build(tl, u_long *, 4 * NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
 	*tl++ = txdr_unsigned(cache);
 	*tl++ = txdr_unsigned(nfsd->nd_duration);
 	txdr_hyper(&frev, tl);
@@ -795,8 +795,8 @@ nqnfsrv_vacated(nfsd, slp, procp, mrq)
 	struct nqlease *tlp = (struct nqlease *)0;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	struct nqm *lphnext;
 	struct mbuf *mreq, *mb;
 	int error = 0, i, len, ok, gotit = 0, cache = 0;
@@ -865,9 +865,9 @@ nqnfs_getlease(vp, rwflag, cred, p)
 	struct ucred *cred;
 	struct proc *p;
 {
-	register u_long *tl;
+	register u_int32_t *tl;
 	register caddr_t cp;
-	register long t1, t2;
+	register int32_t t1, t2;
 	register struct nfsnode *np;
 	struct nfsmount *nmp = VFSTONFS(vp->v_mount);
 	caddr_t bpos, dpos, cp2;
@@ -881,13 +881,13 @@ nqnfs_getlease(vp, rwflag, cred, p)
 	mb = mreq = nfsm_reqh(vp, NQNFSPROC_GETLEASE, NFSX_V3FH+2*NFSX_UNSIGNED,
 		 &bpos);
 	nfsm_fhtom(vp, 1);
-	nfsm_build(tl, u_long *, 2 * NFSX_UNSIGNED);
+	nfsm_build(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 	*tl++ = txdr_unsigned(rwflag);
 	*tl = txdr_unsigned(nmp->nm_leaseterm);
 	reqtime = time_second;
 	nfsm_request(vp, NQNFSPROC_GETLEASE, p, cred);
 	np = VTONFS(vp);
-	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) {
@@ -911,10 +911,10 @@ nqnfs_vacated(vp, cred)
 	register caddr_t cp;
 	register struct mbuf *m;
 	register int i;
-	register u_long *tl;
-	register long t2;
+	register u_int32_t *tl;
+	register int32_t t2;
 	caddr_t bpos;
-	u_long xid;
+	u_int32_t xid;
 	int error = 0;
 	struct mbuf *mreq, *mb, *mb2, *mheadend;
 	struct nfsmount *nmp;
@@ -935,7 +935,7 @@ nqnfs_vacated(vp, cred)
 		0, (char *)NULL, mreq, i, &mheadend, &xid);
 	if (nmp->nm_sotype == SOCK_STREAM) {
 		M_PREPEND(m, NFSX_UNSIGNED, M_WAIT);
-		*mtod(m, u_long *) = htonl(0x80000000 | (m->m_pkthdr.len -
+		*mtod(m, u_int32_t *) = htonl(0x80000000 | (m->m_pkthdr.len -
 			NFSX_UNSIGNED));
 	}
 	myrep.r_flags = 0;
@@ -962,8 +962,8 @@ nqnfs_callback(nmp, mrep, md, dpos)
 	caddr_t dpos;
 {
 	register struct vnode *vp;
-	register u_long *tl;
-	register long t1;
+	register u_int32_t *tl;
+	register int32_t t1;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	struct nfsnode *np;