svn commit: r336878 - head/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sun Jul 29 21:51:17 2018
New Revision: 336878
URL: https://svnweb.freebsd.org/changeset/base/336878

Log:
  Silence newer gcc warnings.
  
  Newer versions of gcc generate "set, but not used" warnings in the NFS server.
  Add __unused macros to silence these warnings.
  
  Requested by:	mmacy

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

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sun Jul 29 21:00:18 2018	(r336877)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sun Jul 29 21:51:17 2018	(r336878)
@@ -1799,7 +1799,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, verf;
+	u_int64_t off, toff, verf __unused;
 	u_long *cookies = NULL, *cookiep;
 	struct uio io;
 	struct iovec iv;

Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdserv.c	Sun Jul 29 21:00:18 2018	(r336877)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.c	Sun Jul 29 21:51:17 2018	(r336878)
@@ -3852,7 +3852,7 @@ nfsrvd_openattr(struct nfsrv_descript *nd, __unused in
     __unused NFSPROC_T *p, __unused struct nfsexstuff *exp)
 {
 	u_int32_t *tl;
-	int error = 0, createdir;
+	int error = 0, createdir __unused;
 
 	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
 	createdir = fxdr_unsigned(int, *tl);

Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Jul 29 21:00:18 2018	(r336877)
+++ head/sys/fs/nfsserver/nfs_nfsdstate.c	Sun Jul 29 21:51:17 2018	(r336878)
@@ -5765,7 +5765,7 @@ nfsrv_localunlock(vnode_t vp, struct nfslockfile *lfp,
     uint64_t init_end, NFSPROC_T *p)
 {
 	struct nfslock *lop;
-	uint64_t first, end, prevfirst;
+	uint64_t first, end, prevfirst __unused;
 
 	first = init_first;
 	end = init_end;