remove #ifndef nolint goo

ok blambert@

3 files changed, 7 insertions, 10 deletions

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index f386ced1f03..50a528e5d20 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_serv.c,v 1.57 2008/06/15 04:03:40 thib Exp $	*/
+/*	$OpenBSD: nfs_serv.c,v 1.58 2008/07/06 16:54:48 thib Exp $	*/
 /*     $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $       */
 
 /*
@@ -1618,9 +1618,8 @@ nfsrv_remove(nfsd, slp, procp, mrq)
 	nfsfh_t nfh;
 	fhandle_t *fhp;
 
-#ifndef nolint
-	vp = (struct vnode *)0;
-#endif
+	vp = NULL;
+
 	fhp = &nfh.fh_generic;
 	nfsm_srvmtofh(fhp);
 	nfsm_srvnamesiz(len);
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index c9268639648..008bbea973f 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_syscalls.c,v 1.69 2008/07/06 13:33:54 thib Exp $	*/
+/*	$OpenBSD: nfs_syscalls.c,v 1.70 2008/07/06 16:54:48 thib Exp $	*/
 /*	$NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $	*/
 
 /*
@@ -290,10 +290,9 @@ nfssvc_nfsd(nsd, argp, p)
 	u_quad_t cur_usec;
 	struct timeval tv;
 
-#ifndef nolint
 	cacherep = RC_DOIT;
 	writes_todo = 0;
-#endif
+
 	s = splsoftnet();
 	if (nfsd == NULL) {
 		nsd->nsd_nfsd = nfsd = malloc(sizeof(struct nfsd), M_NFSD,
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5236968f551..f6eb3a7ae0f 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.93 2008/06/14 22:44:07 blambert Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.94 2008/07/06 16:54:48 thib Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -984,9 +984,8 @@ nfs_readrpc(vp, uiop)
 	int error = 0, len, retlen, tsiz, eof, attrflag;
 	int v3 = NFS_ISV3(vp);
 
-#ifndef nolint
 	eof = 0;
-#endif
+
 	nmp = VFSTONFS(vp->v_mount);
 	tsiz = uiop->uio_resid;
 	if (uiop->uio_offset + tsiz > 0xffffffff && !v3)