X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwiretest.c;h=dbd03d97232836d3d201d360e08e63d0acb6c04a;hp=3f2ee7044b3a047edff8e2cbad5bb12a7c22aa4f;hb=019a3b34c0f4d934266a185bcda048b1dab201ed;hpb=c5c8d0623a60ee54bd11588a391b3dcd43c1abcf

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 3f2ee70..dbd03d9 100644
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -1124,8 +1124,8 @@ void lustre_assert_wire_constants(void)
 		 OBD_CONNECT_TRANSNO);
 	LASSERTF(OBD_CONNECT_IBITS == 0x1000ULL, "found 0x%.16llxULL\n",
 		 OBD_CONNECT_IBITS);
-	LASSERTF(OBD_CONNECT_JOIN == 0x2000ULL, "found 0x%.16llxULL\n",
-		 OBD_CONNECT_JOIN);
+	LASSERTF(OBD_CONNECT_BARRIER == 0x2000ULL, "found 0x%.16llxULL\n",
+		 OBD_CONNECT_BARRIER);
 	LASSERTF(OBD_CONNECT_ATTRFID == 0x4000ULL, "found 0x%.16llxULL\n",
 		 OBD_CONNECT_ATTRFID);
 	LASSERTF(OBD_CONNECT_NODEVOH == 0x8000ULL, "found 0x%.16llxULL\n",
@@ -3315,6 +3315,38 @@ void lustre_assert_wire_constants(void)
 	LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
 		 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
 
+	/* Checks for struct ldlm_gl_barrier_desc */
+	LASSERTF((int)sizeof(struct ldlm_gl_barrier_desc) == 16, "found %lld\n",
+		 (long long)(int)sizeof(struct ldlm_gl_barrier_desc));
+	LASSERTF((int)offsetof(struct ldlm_gl_barrier_desc, lgbd_status) == 0, "found %lld\n",
+		 (long long)(int)offsetof(struct ldlm_gl_barrier_desc, lgbd_status));
+	LASSERTF((int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_status) == 4, "found %lld\n",
+		 (long long)(int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_status));
+	LASSERTF((int)offsetof(struct ldlm_gl_barrier_desc, lgbd_timeout) == 4, "found %lld\n",
+		 (long long)(int)offsetof(struct ldlm_gl_barrier_desc, lgbd_timeout));
+	LASSERTF((int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_timeout) == 4, "found %lld\n",
+		 (long long)(int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_timeout));
+	LASSERTF((int)offsetof(struct ldlm_gl_barrier_desc, lgbd_padding) == 8, "found %lld\n",
+		 (long long)(int)offsetof(struct ldlm_gl_barrier_desc, lgbd_padding));
+	LASSERTF((int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_padding) == 8, "found %lld\n",
+		 (long long)(int)sizeof(((struct ldlm_gl_barrier_desc *)0)->lgbd_padding));
+
+	/* Checks for struct barrier_lvb */
+	LASSERTF((int)sizeof(struct barrier_lvb) == 16, "found %lld\n",
+		 (long long)(int)sizeof(struct barrier_lvb));
+	LASSERTF((int)offsetof(struct barrier_lvb, lvb_status) == 0, "found %lld\n",
+		 (long long)(int)offsetof(struct barrier_lvb, lvb_status));
+	LASSERTF((int)sizeof(((struct barrier_lvb *)0)->lvb_status) == 4, "found %lld\n",
+		 (long long)(int)sizeof(((struct barrier_lvb *)0)->lvb_status));
+	LASSERTF((int)offsetof(struct barrier_lvb, lvb_index) == 4, "found %lld\n",
+		 (long long)(int)offsetof(struct barrier_lvb, lvb_index));
+	LASSERTF((int)sizeof(((struct barrier_lvb *)0)->lvb_index) == 4, "found %lld\n",
+		 (long long)(int)sizeof(((struct barrier_lvb *)0)->lvb_index));
+	LASSERTF((int)offsetof(struct barrier_lvb, lvb_padding) == 8, "found %lld\n",
+		 (long long)(int)offsetof(struct barrier_lvb, lvb_padding));
+	LASSERTF((int)sizeof(((struct barrier_lvb *)0)->lvb_padding) == 8, "found %lld\n",
+		 (long long)(int)sizeof(((struct barrier_lvb *)0)->lvb_padding));
+
 	/* Checks for struct mgs_send_param */
 	LASSERTF((int)sizeof(struct mgs_send_param) == 1024, "found %lld\n",
 		 (long long)(int)sizeof(struct mgs_send_param));