|
@@ -1160,11 +1160,11 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
|
|
*p++ = htonl((u32)((n) >> 32)); \
|
|
*p++ = htonl((u32)((n) >> 32)); \
|
|
*p++ = htonl((u32)(n)); \
|
|
*p++ = htonl((u32)(n)); \
|
|
} while (0)
|
|
} while (0)
|
|
-#define WRITEMEM(ptr,nbytes) do if (nbytes > 0) { \
|
|
|
|
|
|
+#define WRITEMEM(ptr,nbytes) do { if (nbytes > 0) { \
|
|
*(p + XDR_QUADLEN(nbytes) -1) = 0; \
|
|
*(p + XDR_QUADLEN(nbytes) -1) = 0; \
|
|
memcpy(p, ptr, nbytes); \
|
|
memcpy(p, ptr, nbytes); \
|
|
p += XDR_QUADLEN(nbytes); \
|
|
p += XDR_QUADLEN(nbytes); \
|
|
-} while (0)
|
|
|
|
|
|
+}} while (0)
|
|
#define WRITECINFO(c) do { \
|
|
#define WRITECINFO(c) do { \
|
|
*p++ = htonl(c.atomic); \
|
|
*p++ = htonl(c.atomic); \
|
|
*p++ = htonl(c.before_ctime_sec); \
|
|
*p++ = htonl(c.before_ctime_sec); \
|