[Devel] Re: [RFC v14-rc2][PATCH 24/29] c/r: Add CR_COPY() macro (v4)

[Dan Smith]

SH> That's sucky...  yeah i would say a comment, though of course it
SH> could be one of those cases where everyone but me already knows...

Here's a nice fix brought to us by Mr. Lynch...

-- 
Dan Smith
IBM Linux Technology Center
email: danms at us.ibm.com

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff --git a/include/linux/checkpoint.h b/include/linux/checkpoint.h
index 59ec563..a8d758f 100644
--- a/include/linux/checkpoint.h
+++ b/include/linux/checkpoint.h
@@ -138,12 +138,14 @@ extern int cr_read_file(struct cr_ctx *ctx, int objref);
  */
 #define CR_COPY_ARRAY(op, SAVE, LIVE, count)				\
 	do {								\
+		(void)__must_be_array(SAVE);				\
+		(void)__must_be_array(LIVE);				\
 		BUILD_BUG_ON(sizeof(*SAVE) != sizeof(*LIVE));		\
 		if (op == CR_CPT)					\
 			memcpy(SAVE, LIVE, count * sizeof(*SAVE));	\
 		else							\
 			memcpy(LIVE, SAVE, count * sizeof(*SAVE));	\
-	} while (__must_be_array(SAVE) && __must_be_array(LIVE) && 0)
+	} while (0)
 
 
 #define cr_debug(fmt, args...)  \



_______________________________________________
Containers mailing list
Containers at lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers