nfs: nfs4xdr.c do-while is not a compound statement
PATCH 2/2 nfs: nfs4xdr.c do-while is not a compound statement
The WRITEMEM macro produces sparse warnings of the form:fs/nfsd/nfs4xdr.c:2668:2: warning: do-while statement is not a compound statement
Signed-off-by Harvey Harrison <[email protected]>
--- fs/nfsd/nfs4xdr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfs4xdr.c +2 -2
@@ -1162,11 +1162,11 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) *p++ =htonl ((u32)((n) >>32 )); \ *p++ =htonl ((u32)(n)); \ } while (0) -#define WRITEMEM (ptr,nbytes) do if (nbytes > 0) { \ +#define WRITEMEM (ptr,nbytes) do { if (nbytes > 0) { \ *(p + XDR_QUADLEN(nbytes) -1) = 0; \ memcpy(p, ptr, nbytes); \ p += XDR_QUADLEN(nbytes); \ -} while (0) +}} while (0)#define WRITECINFO (c) do { \ *p++ = htonl(c.atomic); \ *p++ = htonl(c.before_ctime_sec); \
Signature · 1 line
1.5.6.3.569.ga9185
J. Bruce Fields
AppliedThanks, applied.--b.
Quoted 29 lines · Harvey Harrison
The WRITEMEM macro produces sparse warnings of the form:
fs/nfsd/nfs4xdr.c:2668:2: warning: do-while statement is not a compound statementSigned-off-by Harvey Harrison <[email protected]>--- fs/nfsd/nfs4xdr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/nfsd/nfs4xdr.c +2
-2@@ -1162,11 +1162,11 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) *p++ =htonl ((u32)((n) >>32 )); \ *p++ =htonl ((u32)(n)); \ } while (0) -#define WRITEMEM (ptr,nbytes) do if (nbytes > 0) { \ +#define WRITEMEM (ptr,nbytes) do { if (nbytes > 0) { \ *(p + XDR_QUADLEN(nbytes) -1) = 0; \ memcpy(p, ptr, nbytes); \ p += XDR_QUADLEN(nbytes); \ -} while (0) +}} while (0)#define WRITECINFO (c) do { \ *p++ = htonl(c.atomic); \ *p++ = htonl(c.before_ctime_sec); \Signature · 1 line
1.5.6.3.569.ga9185