From 8014c971473b7a255de8089404a4be671d6f336e Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Sun, 29 Jul 2018 21:51:17 +0000 Subject: [PATCH] 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 --- sys/fs/nfsserver/nfs_nfsdport.c | 2 +- sys/fs/nfsserver/nfs_nfsdserv.c | 2 +- sys/fs/nfsserver/nfs_nfsdstate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 9916f5c328d9..7bca71e381bc 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -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; diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 7ea3fe22ad70..b9e3215cd5b9 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -3852,7 +3852,7 @@ nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram, __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); diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index c9f8c703d1a0..026af9d89621 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -5765,7 +5765,7 @@ nfsrv_localunlock(vnode_t vp, struct nfslockfile *lfp, uint64_t init_first, 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;