Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jun 2018 11:35:04 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r334610 - head/sys/fs/nfsserver
Message-ID:  <201806041135.w54BZ4Q2060387@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rmacklem
Date: Mon Jun  4 11:35:04 2018
New Revision: 334610
URL: https://svnweb.freebsd.org/changeset/base/334610

Log:
  Revert r334586 since I now think __unused is the better way to handle this.

Modified:
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Mon Jun  4 06:30:35 2018	(r334609)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Mon Jun  4 11:35:04 2018	(r334610)
@@ -1574,10 +1574,7 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdgram,
 	struct nfsvattr at;
 	int nlen, error = 0, getret = 1;
 	int siz, cnt, fullsiz, eofflag, ncookies;
-	u_int64_t off, toff;
-#if 0
-	u_int64_t verf;
-#endif
+	u_int64_t off, toff, verf;
 	u_long *cookies = NULL, *cookiep;
 	struct uio io;
 	struct iovec iv;
@@ -1594,9 +1591,7 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdgram,
 		NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
 		off = fxdr_hyper(tl);
 		tl += 2;
-#if 0
 		verf = fxdr_hyper(tl);
-#endif
 		tl += 2;
 	}
 	toff = off;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806041135.w54BZ4Q2060387>