Module Name: src
Committed By: martin
Date: Sat Sep 14 22:29:09 UTC 2013
Modified Files:
src/sys/nfs: nfs_serv.c nfs_socket.c nfs_vnops.c nfsm_subs.h
Log Message:
Backout wildcard pragma to kill warnings and instead sprinkle a few dozen
__unused attributes.
Requested by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/nfs/nfs_serv.c
cvs rdiff -u -r1.189 -r1.190 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.299 -r1.300 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.52 -r1.53 src/sys/nfs/nfsm_subs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.165 src/sys/nfs/nfs_serv.c:1.166
--- src/sys/nfs/nfs_serv.c:1.165 Wed Aug 29 14:00:22 2012
+++ src/sys/nfs/nfs_serv.c Sat Sep 14 22:29:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_serv.c,v 1.165 2012/08/29 14:00:22 christos Exp $ */
+/* $NetBSD: nfs_serv.c,v 1.166 2013/09/14 22:29:08 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.165 2012/08/29 14:00:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.166 2013/09/14 22:29:08 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,7 +166,7 @@ nfsrv3_access(struct nfsrv_descript *nfs
char *bpos;
int error = 0, rdonly, cache = 0, getret;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vattr va;
u_long inmode, testmode, outmode;
u_quad_t frev;
@@ -231,7 +231,7 @@ nfsrv_getattr(struct nfsrv_descript *nfs
char *bpos;
int error = 0, rdonly, cache = 0;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
u_quad_t frev;
nfsm_srvmtofh(&nsfh);
@@ -273,7 +273,7 @@ nfsrv_setattr(struct nfsrv_descript *nfs
int error = 0, rdonly, cache = 0, preat_ret = 1, postat_ret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3), gcheck = 0;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
u_quad_t frev;
struct timespec guard;
@@ -402,7 +402,7 @@ nfsrv_lookup(struct nfsrv_descript *nfsd
uint32_t len;
int v3 = (nfsd->nd_flag & ND_NFSV3), pubflag;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vattr va, dirattr;
u_quad_t frev;
@@ -529,7 +529,7 @@ nfsrv_readlink(struct nfsrv_descript *nf
uint32_t len;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mp2 = NULL, *mp3 = NULL, *mreq;
+ struct mbuf *mb, *mp2 = NULL, *mp3 = NULL, *mreq __unused;
struct vnode *vp;
struct vattr attr;
nfsrvfh_t nsfh;
@@ -852,7 +852,7 @@ nfsrv_write(struct nfsrv_descript *nfsd,
int stable = NFSV3WRITE_FILESYNC;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp;
nfsrvfh_t nsfh;
struct uio io, *uiop = &io;
@@ -1420,7 +1420,7 @@ nfsrv_create(struct nfsrv_descript *nfsd
int rdev = 0, abort = 0;
int v3 = (nfsd->nd_flag & ND_NFSV3), how, exclusive_flag = 0;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp = NULL, *dirp = NULL;
nfsrvfh_t nsfh;
u_quad_t frev, tempsize;
@@ -1660,7 +1660,7 @@ nfsrv_mknod(struct nfsrv_descript *nfsd,
u_int32_t major, minor;
enum vtype vtyp;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp, *dirp = (struct vnode *)0;
nfsrvfh_t nsfh;
u_quad_t frev;
@@ -1810,7 +1810,7 @@ nfsrv_remove(struct nfsrv_descript *nfsd
int error = 0, cache = 0, len, dirfor_ret = 1, diraft_ret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp, *dirp;
struct vattr dirfor, diraft;
nfsrvfh_t nsfh;
@@ -1897,7 +1897,7 @@ nfsrv_rename(struct nfsrv_descript *nfsd
int tdirfor_ret = 1, tdiraft_ret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct nameidata fromnd, tond;
struct vnode *fvp, *tvp, *tdvp;
struct vnode *fdirp = NULL, *tdirp = NULL;
@@ -2169,7 +2169,7 @@ nfsrv_link(struct nfsrv_descript *nfsd,
int error = 0, rdonly, cache = 0, len, dirfor_ret = 1, diraft_ret = 1;
int getret = 1, v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp, *xp, *dirp = (struct vnode *)0;
struct vattr dirfor, diraft, at;
nfsrvfh_t nsfh, dnsfh;
@@ -2271,7 +2271,7 @@ nfsrv_symlink(struct nfsrv_descript *nfs
int error = 0, cache = 0, dirfor_ret = 1, diraft_ret = 1, abort = 0;
uint32_t len, len2;
int v3 = (nfsd->nd_flag & ND_NFSV3);
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *dirp = (struct vnode *)0;
nfsrvfh_t nsfh;
u_quad_t frev;
@@ -2415,7 +2415,7 @@ nfsrv_mkdir(struct nfsrv_descript *nfsd,
int abort = 0;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp, *dirp = (struct vnode *)0;
nfsrvfh_t nsfh;
u_quad_t frev;
@@ -2535,7 +2535,7 @@ nfsrv_rmdir(struct nfsrv_descript *nfsd,
int error = 0, cache = 0, len, dirfor_ret = 1, diraft_ret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp, *dirp = (struct vnode *)0;
struct vattr dirfor, diraft;
nfsrvfh_t nsfh;
@@ -2670,7 +2670,7 @@ nfsrv_readdir(struct nfsrv_descript *nfs
u_int32_t *tl;
int32_t t1;
char *bpos;
- struct mbuf *mb, *mreq, *mp2;
+ struct mbuf *mb, *mreq __unused, *mp2;
char *cpos, *cend, *cp2, *rbuf;
struct vnode *vp;
struct vattr at;
@@ -2680,7 +2680,10 @@ nfsrv_readdir(struct nfsrv_descript *nfs
int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
int siz, cnt, fullsiz, eofflag, rdonly, cache = 0, ncookies;
int v3 = (nfsd->nd_flag & ND_NFSV3);
- u_quad_t frev, off, toff, verf;
+ u_quad_t frev, off, toff;
+#ifdef NFS3_STRICTVERF
+ u_quad_t verf;
+#endif
off_t *cookies = NULL, *cookiep;
nfsuint64 jar;
@@ -2689,7 +2692,9 @@ nfsrv_readdir(struct nfsrv_descript *nfs
nfsm_dissect(tl, u_int32_t *, 5 * NFSX_UNSIGNED);
toff = fxdr_hyper(tl);
tl += 2;
+#ifdef NFS3_STRICTVERF
verf = fxdr_hyper(tl);
+#endif
tl += 2;
} else {
nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
@@ -2928,7 +2933,7 @@ nfsrv_readdirplus(struct nfsrv_descript
u_int32_t *tl;
int32_t t1;
char *bpos;
- struct mbuf *mb, *mreq, *mp2;
+ struct mbuf *mb, *mreq __unused, *mp2;
char *cpos, *cend, *cp2, *rbuf;
struct vnode *vp, *nvp;
struct flrep fl;
@@ -2939,14 +2944,19 @@ nfsrv_readdirplus(struct nfsrv_descript
struct nfs_fattr *fp;
int len, nlen, rem, xfer, tsiz, i, error = 0, getret = 1;
int siz, cnt, fullsiz, eofflag, rdonly, cache = 0, dirlen, ncookies;
- u_quad_t frev, off, toff, verf;
+ u_quad_t frev, off, toff;
+#ifdef NFS3_STRICTVERF
+ u_quad_t verf;
+#endif
off_t *cookies = NULL, *cookiep;
nfsm_srvmtofh(&nsfh);
nfsm_dissect(tl, u_int32_t *, 6 * NFSX_UNSIGNED);
toff = fxdr_hyper(tl);
tl += 2;
+#ifdef NFS3_STRICTVERF
verf = fxdr_hyper(tl);
+#endif
tl += 2;
siz = fxdr_unsigned(int, *tl++);
cnt = fxdr_unsigned(int, *tl);
@@ -3254,7 +3264,7 @@ nfsrv_commit(struct nfsrv_descript *nfsd
int error = 0, rdonly, for_ret = 1, aft_ret = 1, cache = 0;
uint32_t cnt;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
u_quad_t frev, off, end;
nfsm_srvmtofh(&nsfh);
@@ -3309,7 +3319,7 @@ nfsrv_statfs(struct nfsrv_descript *nfsd
int error = 0, rdonly, cache = 0, getret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp;
struct vattr at;
nfsrvfh_t nsfh;
@@ -3378,7 +3388,7 @@ nfsrv_fsinfo(struct nfsrv_descript *nfsd
int error = 0, rdonly, cache = 0, getret = 1;
uint32_t maxdata;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp;
struct vattr at;
nfsrvfh_t nsfh;
@@ -3448,7 +3458,7 @@ nfsrv_pathconf(struct nfsrv_descript *nf
int error = 0, rdonly, cache = 0, getret = 1;
register_t linkmax, namemax, chownres, notrunc;
char *cp2;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
struct vnode *vp;
struct vattr at;
nfsrvfh_t nsfh;
@@ -3503,7 +3513,7 @@ nfsrv_null(struct nfsrv_descript *nfsd,
struct mbuf *mrep = nfsd->nd_mrep;
char *bpos;
int error = NFSERR_RETVOID, cache = 0;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
u_quad_t frev;
nfsm_reply(0);
@@ -3522,7 +3532,7 @@ nfsrv_noop(struct nfsrv_descript *nfsd,
struct mbuf *mrep = nfsd->nd_mrep;
char *bpos;
int error, cache = 0;
- struct mbuf *mb, *mreq;
+ struct mbuf *mb, *mreq __unused;
u_quad_t frev;
if (nfsd->nd_repstat)
Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.189 src/sys/nfs/nfs_socket.c:1.190
--- src/sys/nfs/nfs_socket.c:1.189 Wed Mar 23 17:42:11 2011
+++ src/sys/nfs/nfs_socket.c Sat Sep 14 22:29:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.189 2011/03/23 17:42:11 tls Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.190 2013/09/14 22:29:08 martin Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.189 2011/03/23 17:42:11 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.190 2013/09/14 22:29:08 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -605,6 +605,8 @@ nfs_rephead(int siz, struct nfsrv_descri
*/
#ifdef NFSKERB
XXX
+#else
+ (void)ktvin.tv_sec;
#endif
*tl++ = rpc_auth_kerb;
@@ -1165,6 +1167,8 @@ nfs_getreq(struct nfsrv_descript *nd, st
*/
#ifdef NFSKERB
XXX
+#else
+ (void)tvin.tv_sec;
#endif
tvout.tv_sec = fxdr_unsigned(long, tvout.tv_sec);
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.299 src/sys/nfs/nfs_vnops.c:1.300
--- src/sys/nfs/nfs_vnops.c:1.299 Mon Mar 18 19:35:45 2013
+++ src/sys/nfs/nfs_vnops.c Sat Sep 14 22:29:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.299 2013/03/18 19:35:45 plunky Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.300 2013/09/14 22:29:08 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.299 2013/03/18 19:35:45 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.300 2013/09/14 22:29:08 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -290,7 +290,7 @@ nfs_null(struct vnode *vp, kauth_cred_t
{
char *bpos, *dpos;
int error = 0;
- struct mbuf *mreq, *mrep, *md, *mb;
+ struct mbuf *mreq, *mrep, *md, *mb __unused;
struct nfsnode *np = VTONFS(vp);
nfsm_reqhead(np, NFSPROC_NULL, 0);
Index: src/sys/nfs/nfsm_subs.h
diff -u src/sys/nfs/nfsm_subs.h:1.52 src/sys/nfs/nfsm_subs.h:1.53
--- src/sys/nfs/nfsm_subs.h:1.52 Sat Sep 14 21:48:49 2013
+++ src/sys/nfs/nfsm_subs.h Sat Sep 14 22:29:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsm_subs.h,v 1.52 2013/09/14 21:48:49 martin Exp $ */
+/* $NetBSD: nfsm_subs.h,v 1.53 2013/09/14 22:29:08 martin Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -255,14 +255,6 @@
#define NFSV3_WCCRATTR 0
#define NFSV3_WCCCHK 1
-#if __GNUC_PREREQ__(4, 8)
-/*
- * With all the macros in here, it is hard to track set-but-not-used cases
- * and avoid them without cluttering the code.
- */
-_Pragma("GCC diagnostic ignored \"-Wunused-but-set-variable\"")
-#endif
-
#define nfsm_wcc_data(v, f, flags, docheck) \
{ int ttattrf, ttretf = 0, renewctime = 0, renewnctime = 0; \
struct timespec ctime, mtime; \
