Remove the "frev" argument from nfs_rephead(); and clean up the "frev"

variables, that are declared all over, since they are passed via macros
to nfs_rephead(); which doesn't do anything with it.

OK krw@

5 files changed, 18 insertions, 37 deletions

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 3f33a88afc6..6f762ec410d 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_serv.c,v 1.42 2007/09/20 12:54:31 thib Exp $	*/
+/*	$OpenBSD: nfs_serv.c,v 1.43 2007/10/28 14:12:41 thib Exp $	*/
 /*     $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $       */
 
 /*
@@ -114,7 +114,6 @@ nfsrv3_access(nfsd, slp, procp, mrq)
 	struct mbuf *mb, *mreq, *mb2;
 	struct vattr va;
 	u_long testmode, nfsmode;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -180,7 +179,6 @@ nfsrv_getattr(nfsd, slp, procp, mrq)
 	int error = 0, rdonly;
 	char *cp2;
 	struct mbuf *mb, *mb2, *mreq;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -228,7 +226,6 @@ nfsrv_setattr(nfsd, slp, procp, mrq)
 	int v3 = (nfsd->nd_flag & ND_NFSV3), gcheck = 0;
 	char *cp2;
 	struct mbuf *mb, *mb2, *mreq;
-	u_quad_t frev;
 	struct timespec guard;
 
 	fhp = &nfh.fh_generic;
@@ -361,7 +358,6 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
 	char *cp2;
 	struct mbuf *mb, *mb2, *mreq;
 	struct vattr va, dirattr;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -437,7 +433,6 @@ nfsrv_readlink(nfsd, slp, procp, mrq)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	struct uio io, *uiop = &io;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -542,7 +537,6 @@ nfsrv_read(nfsd, slp, procp, mrq)
 	struct uio io, *uiop = &io;
 	struct vattr va;
 	off_t off;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -709,7 +703,6 @@ nfsrv_write(nfsd, slp, procp, mrq)
 	fhandle_t *fhp;
 	struct uio io, *uiop = &io;
 	off_t off;
-	u_quad_t frev;
 
 	if (mrep == NULL) {
 		*mrq = NULL;
@@ -890,7 +883,7 @@ nfsrv_writegather(ndp, slp, procp, mrq)
 	struct mbuf *mb, *mb2, *mreq, *mrep, *md;
 	struct vnode *vp;
 	struct uio io, *uiop = &io;
-	u_quad_t frev, cur_usec;
+	u_quad_t cur_usec;
 	struct timeval tv;
 
 	*mrq = NULL;
@@ -1255,7 +1248,7 @@ nfsrv_create(nfsd, slp, procp, mrq)
 	struct vnode *vp = NULL, *dirp = NULL;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev, tempsize;
+	u_quad_t tempsize;
 	u_char cverf[NFSX_V3CREATEVERF];
 
 	nd.ni_cnd.cn_nameiop = 0;
@@ -1491,7 +1484,6 @@ nfsrv_mknod(nfsd, slp, procp, mrq)
 	struct vnode *vp, *dirp = (struct vnode *)0;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 	nd.ni_cnd.cn_nameiop = 0;
 	fhp = &nfh.fh_generic;
@@ -1638,7 +1630,6 @@ nfsrv_remove(nfsd, slp, procp, mrq)
 	struct vattr dirfor, diraft;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 #ifndef nolint
 	vp = (struct vnode *)0;
@@ -1725,7 +1716,6 @@ nfsrv_rename(nfsd, slp, procp, mrq)
 	struct vattr fdirfor, fdiraft, tdirfor, tdiraft;
 	nfsfh_t fnfh, tnfh;
 	fhandle_t *ffhp, *tfhp;
-	u_quad_t frev;
 	uid_t saved_uid;
 
 	ffhp = &fnfh.fh_generic;
@@ -1903,7 +1893,6 @@ nfsrv_link(nfsd, slp, procp, mrq)
 	struct vattr dirfor, diraft, at;
 	nfsfh_t nfh, dnfh;
 	fhandle_t *fhp, *dfhp;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	dfhp = &dnfh.fh_generic;
@@ -2002,7 +1991,6 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
 	struct vnode *dirp = (struct vnode *)0;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 	nd.ni_cnd.cn_nameiop = 0;
 	fhp = &nfh.fh_generic;
@@ -2143,7 +2131,6 @@ nfsrv_mkdir(nfsd, slp, procp, mrq)
 	struct vnode *vp, *dirp = (struct vnode *)0;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -2255,7 +2242,6 @@ nfsrv_rmdir(nfsd, slp, procp, mrq)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	struct nameidata nd;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -2389,7 +2375,7 @@ nfsrv_readdir(nfsd, slp, procp, mrq)
 	int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
 	int siz, cnt, fullsiz, eofflag, rdonly, ncookies;
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
-	u_quad_t frev, off, toff, verf;
+	u_quad_t off, toff, verf;
 	u_long *cookies = NULL, *cookiep;
 
 	fhp = &nfh.fh_generic;
@@ -2653,7 +2639,7 @@ nfsrv_readdirplus(nfsd, slp, procp, mrq)
 	struct nfs_fattr *fp;
 	int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
 	int siz, cnt, fullsiz, eofflag, rdonly, dirlen, ncookies;
-	u_quad_t frev, off, toff, verf;
+	u_quad_t off, toff, verf;
 	u_long *cookies = NULL, *cookiep;
 
 	fhp = &nfh.fh_generic;
@@ -2966,7 +2952,7 @@ nfsrv_commit(nfsd, slp, procp, mrq)
 	int error = 0, rdonly, for_ret = 1, aft_ret = 1, cnt;
 	char *cp2;
 	struct mbuf *mb, *mb2, *mreq;
-	u_quad_t frev, off;
+	u_quad_t off;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -3030,7 +3016,7 @@ nfsrv_statfs(nfsd, slp, procp, mrq)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 	struct statfs statfs;
-	u_quad_t frev, tval;
+	u_quad_t tval;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -3104,7 +3090,6 @@ nfsrv_fsinfo(nfsd, slp, procp, mrq)
 	struct vattr at;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -3174,7 +3159,6 @@ nfsrv_pathconf(nfsd, slp, procp, mrq)
 	struct vattr at;
 	nfsfh_t nfh;
 	fhandle_t *fhp;
-	u_quad_t frev;
 
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
@@ -3231,7 +3215,6 @@ nfsrv_null(nfsd, slp, procp, mrq)
 	caddr_t bpos;
 	int error = NFSERR_RETVOID;
 	struct mbuf *mb, *mreq;
-	u_quad_t frev;
 
 	nfsm_reply(0);
 	return (0);
@@ -3252,7 +3235,6 @@ nfsrv_noop(nfsd, slp, procp, mrq)
 	caddr_t bpos;
 	int error;
 	struct mbuf *mb, *mreq;
-	u_quad_t frev;
 
 	if (nfsd->nd_repstat)
 		error = nfsd->nd_repstat;
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index b56455489b5..427aa8e1ca4 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_socket.c,v 1.54 2007/10/17 17:44:23 thib Exp $	*/
+/*	$OpenBSD: nfs_socket.c,v 1.55 2007/10/28 14:12:41 thib Exp $	*/
 /*	$NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $	*/
 
 /*
@@ -1044,12 +1044,11 @@ nfsmout:
  * siz arg. is used to decide if adding a cluster is worthwhile
  */
 int
-nfs_rephead(siz, nd, slp, err, frev, mrq, mbp, bposp)
+nfs_rephead(siz, nd, slp, err, mrq, mbp, bposp)
 	int siz;
 	struct nfsrv_descript *nd;
 	struct nfssvc_sock *slp;
 	int err;
-	u_quad_t *frev;
 	struct mbuf **mrq;
 	struct mbuf **mbp;
 	caddr_t *bposp;
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 06cf1001b5d..e0784494671 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_srvcache.c,v 1.13 2007/09/20 12:54:31 thib Exp $	*/
+/*	$OpenBSD: nfs_srvcache.c,v 1.14 2007/10/28 14:12:41 thib Exp $	*/
 /*	$NetBSD: nfs_srvcache.c,v 1.12 1996/02/18 11:53:49 fvdl Exp $	*/
 
 /*
@@ -195,7 +195,7 @@ loop:
 			} else if (rp->rc_flag & RC_REPSTATUS) {
 				nfsstats.srvcache_nonidemdonehits++;
 				nfs_rephead(0, nd, slp, rp->rc_status,
-				   (u_quad_t *)0, repp, &mb, &bpos);
+				   repp, &mb, &bpos);
 				ret = RC_REPLY;
 			} else if (rp->rc_flag & RC_REPMBUF) {
 				nfsstats.srvcache_nonidemdonehits++;
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index 31116a15f80..14adc66a120 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_var.h,v 1.30 2007/10/14 19:34:41 thib Exp $	*/
+/*	$OpenBSD: nfs_var.h,v 1.31 2007/10/28 14:12:41 thib Exp $	*/
 /*	$NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $	*/
 
 /*
@@ -214,7 +214,7 @@ int nfs_request(struct vnode *, struct mbuf *, int, struct proc *,
 		     struct ucred *, struct mbuf **, struct mbuf **,
 		     caddr_t *);
 int nfs_rephead(int, struct nfsrv_descript *, struct nfssvc_sock *, int,
-		u_quad_t *, struct mbuf **, struct mbuf **, caddr_t *);
+		struct mbuf **, struct mbuf **, caddr_t *);
 void nfs_timer(void *);
 int nfs_sigintr(struct nfsmount *, struct nfsreq *, struct proc *);
 int nfs_sndlock(int *, struct nfsreq *);
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index c9313944c43..89ab7245392 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsm_subs.h,v 1.18 2007/09/26 16:00:55 blambert Exp $	*/
+/*	$OpenBSD: nfsm_subs.h,v 1.19 2007/10/28 14:12:41 thib Exp $	*/
 /*	$NetBSD: nfsm_subs.h,v 1.10 1996/03/20 21:59:56 fvdl Exp $	*/
 
 /*
@@ -356,10 +356,10 @@
 		{ \
 		nfsd->nd_repstat = error; \
 		if (error && !(nfsd->nd_flag & ND_NFSV3)) \
-		   (void) nfs_rephead(0, nfsd, slp, error, &frev, \
+		   (void) nfs_rephead(0, nfsd, slp, error, \
 			mrq, &mb, &bpos); \
 		else \
-		   (void) nfs_rephead((s), nfsd, slp, error, &frev, \
+		   (void) nfs_rephead((s), nfsd, slp, error, \
 			mrq, &mb, &bpos); \
 		if (mrep != NULL) { \
 			m_freem(mrep); \
@@ -375,10 +375,10 @@
 		{ \
 		nfsd->nd_repstat = error; \
 		if (error && !(v3)) \
-		   (void) nfs_rephead(0, nfsd, slp, error, &frev, \
+		   (void) nfs_rephead(0, nfsd, slp, error, \
 			&mreq, &mb, &bpos); \
 		else \
-		   (void) nfs_rephead((s), nfsd, slp, error, &frev, \
+		   (void) nfs_rephead((s), nfsd, slp, error, \
 			&mreq, &mb, &bpos); \
 		}