Whamcloud - gitweb
LU-6179 llite: remove LOCKAHEAD_OLD compatibility
[fs/lustre-release.git] / lustre / ptlrpc / wiretest.c
index 6080876..b0d40ad 100644 (file)
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_LUSTRE_FS_POSIX_ACL
 # include <linux/fs.h>
 # include <linux/posix_acl_xattr.h>
-#endif /* CONFIG_FS_POSIX_ACL */
+#endif /* CONFIG_LUSTRE_FS_POSIX_ACL */
 
 #include <obd_support.h>
 #include <obd_class.h>
@@ -62,7 +62,7 @@ void lustre_assert_wire_constants(void)
                 MDS_DIR_END_OFF);
        LASSERTF(DEAD_HANDLE_MAGIC == 0xdeadbeefcafebabeULL, "found 0x%.16llxULL\n",
                 DEAD_HANDLE_MAGIC);
-       CLASSERT(MTI_NAME_MAXLEN == 64);
+       BUILD_BUG_ON(MTI_NAME_MAXLEN != 64);
        LASSERTF(OST_REPLY == 0, "found %lld\n",
                 (long long)OST_REPLY);
        LASSERTF(OST_GETATTR == 1, "found %lld\n",
@@ -103,7 +103,9 @@ void lustre_assert_wire_constants(void)
                 (long long)OST_QUOTA_ADJUST_QUNIT);
        LASSERTF(OST_LADVISE == 21, "found %lld\n",
                 (long long)OST_LADVISE);
-       LASSERTF(OST_LAST_OPC == 22, "found %lld\n",
+       LASSERTF(OST_FALLOCATE == 22, "found %lld\n",
+                (long long)OST_FALLOCATE);
+       LASSERTF(OST_LAST_OPC == 23, "found %lld\n",
                 (long long)OST_LAST_OPC);
        LASSERTF(OBD_OBJECT_EOF == 0xffffffffffffffffULL, "found 0x%.16llxULL\n",
                 OBD_OBJECT_EOF);
@@ -175,7 +177,9 @@ void lustre_assert_wire_constants(void)
                 (long long)MDS_HSM_CT_UNREGISTER);
        LASSERTF(MDS_SWAP_LAYOUTS == 61, "found %lld\n",
                 (long long)MDS_SWAP_LAYOUTS);
-       LASSERTF(MDS_LAST_OPC == 62, "found %lld\n",
+       LASSERTF(MDS_RMFID == 62, "found %lld\n",
+                (long long)MDS_RMFID);
+       LASSERTF(MDS_LAST_OPC == 63, "found %lld\n",
                 (long long)MDS_LAST_OPC);
        LASSERTF(REINT_SETATTR == 1, "found %lld\n",
                 (long long)REINT_SETATTR);
@@ -325,24 +329,24 @@ void lustre_assert_wire_constants(void)
                 (long long)LCK_MAXMODE);
        LASSERTF(LCK_MODE_NUM == 8, "found %lld\n",
                 (long long)LCK_MODE_NUM);
-       CLASSERT(LDLM_PLAIN == 10);
-       CLASSERT(LDLM_EXTENT == 11);
-       CLASSERT(LDLM_FLOCK == 12);
-       CLASSERT(LDLM_IBITS == 13);
-       CLASSERT(LDLM_MAX_TYPE == 14);
-       CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
-       CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
+       BUILD_BUG_ON(LDLM_PLAIN != 10);
+       BUILD_BUG_ON(LDLM_EXTENT != 11);
+       BUILD_BUG_ON(LDLM_FLOCK != 12);
+       BUILD_BUG_ON(LDLM_IBITS != 13);
+       BUILD_BUG_ON(LDLM_MAX_TYPE != 14);
+       BUILD_BUG_ON(LUSTRE_RES_ID_SEQ_OFF != 0);
+       BUILD_BUG_ON(LUSTRE_RES_ID_VER_OID_OFF != 1);
        LASSERTF(OUT_UPDATE == 1000, "found %lld\n",
                 (long long)OUT_UPDATE);
        LASSERTF(OUT_UPDATE_LAST_OPC == 1001, "found %lld\n",
                 (long long)OUT_UPDATE_LAST_OPC);
-       CLASSERT(LUSTRE_RES_ID_QUOTA_SEQ_OFF == 2);
-       CLASSERT(LUSTRE_RES_ID_QUOTA_VER_OID_OFF == 3);
-       CLASSERT(LUSTRE_RES_ID_HSH_OFF == 3);
-       CLASSERT(LQUOTA_TYPE_USR == 0);
-       CLASSERT(LQUOTA_TYPE_GRP == 1);
-       CLASSERT(LQUOTA_RES_MD == 1);
-       CLASSERT(LQUOTA_RES_DT == 2);
+       BUILD_BUG_ON(LUSTRE_RES_ID_QUOTA_SEQ_OFF != 2);
+       BUILD_BUG_ON(LUSTRE_RES_ID_QUOTA_VER_OID_OFF != 3);
+       BUILD_BUG_ON(LUSTRE_RES_ID_HSH_OFF != 3);
+       BUILD_BUG_ON(LQUOTA_TYPE_USR != 0);
+       BUILD_BUG_ON(LQUOTA_TYPE_GRP != 1);
+       BUILD_BUG_ON(LQUOTA_RES_MD != 1);
+       BUILD_BUG_ON(LQUOTA_RES_DT != 2);
        LASSERTF(OBD_PING == 400, "found %lld\n",
                 (long long)OBD_PING);
        LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
@@ -434,6 +438,8 @@ void lustre_assert_wire_constants(void)
                (unsigned)LMAC_STRIPE_INFO);
        LASSERTF(LMAC_COMP_INFO == 0x00000020UL, "found 0x%.8xUL\n",
                (unsigned)LMAC_COMP_INFO);
+       LASSERTF(LMAC_IDX_BACKUP == 0x00000040UL, "found 0x%.8xUL\n",
+               (unsigned)LMAC_IDX_BACKUP);
        LASSERTF(LMAI_RELEASED == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)LMAI_RELEASED);
        LASSERTF(LMAI_AGENT == 0x00000002UL, "found 0x%.8xUL\n",
@@ -568,6 +574,8 @@ void lustre_assert_wire_constants(void)
                 (long long)FID_SEQ_UNUSED_START);
        LASSERTF(FID_SEQ_UNUSED_END == 9, "found %lld\n",
                 (long long)FID_SEQ_UNUSED_END);
+       LASSERTF(FID_SEQ_LLOG_NAME == 10, "found %lld\n",
+                (long long)FID_SEQ_LLOG_NAME);
        LASSERTF(FID_SEQ_RSVD == 11, "found %lld\n",
                 (long long)FID_SEQ_RSVD);
        LASSERTF(FID_SEQ_IGIF == 12, "found %lld\n",
@@ -584,6 +592,8 @@ void lustre_assert_wire_constants(void)
                        (long long)FID_SEQ_LOCAL_FILE);
        LASSERTF(FID_SEQ_DOT_LUSTRE == 0x0000000200000002ULL, "found 0x%.16llxULL\n",
                        (long long)FID_SEQ_DOT_LUSTRE);
+       LASSERTF(FID_SEQ_LOCAL_NAME == 0x0000000200000003ULL, "found 0x%.16llxULL\n",
+                       (long long)FID_SEQ_LOCAL_NAME);
        LASSERTF(FID_SEQ_SPECIAL == 0x0000000200000004ULL, "found 0x%.16llxULL\n",
                        (long long)FID_SEQ_SPECIAL);
        LASSERTF(FID_SEQ_QUOTA == 0x0000000200000005ULL, "found 0x%.16llxULL\n",
@@ -608,6 +618,8 @@ void lustre_assert_wire_constants(void)
                (unsigned)FID_OID_DOT_LUSTRE);
        LASSERTF(FID_OID_DOT_LUSTRE_OBF == 0x00000002UL, "found 0x%.8xUL\n",
                (unsigned)FID_OID_DOT_LUSTRE_OBF);
+       LASSERTF(FID_OID_DOT_LUSTRE_LPF == 0x00000003UL, "found 0x%.8xUL\n",
+               (unsigned)FID_OID_DOT_LUSTRE_LPF);
 
        /* Checks for struct lu_dirent */
        LASSERTF((int)sizeof(struct lu_dirent) == 32, "found %lld\n",
@@ -719,6 +731,10 @@ void lustre_assert_wire_constants(void)
                 (long long)LU_LADVISE_WILLREAD);
        LASSERTF(LU_LADVISE_DONTNEED == 2, "found %lld\n",
                 (long long)LU_LADVISE_DONTNEED);
+       LASSERTF(LU_LADVISE_LOCKNOEXPAND == 3, "found %lld\n",
+                (long long)LU_LADVISE_LOCKNOEXPAND);
+       LASSERTF(LU_LADVISE_LOCKAHEAD == 4, "found %lld\n",
+                (long long)LU_LADVISE_LOCKAHEAD);
 
        /* Checks for struct ladvise_hdr */
        LASSERTF((int)sizeof(struct ladvise_hdr) == 32, "found %lld\n",
@@ -751,10 +767,9 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct ladvise_hdr, lah_advise));
        LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_advise) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_advise));
-       LASSERTF(LF_ASYNC == 1, "found %lld\n",
-                (long long)LF_ASYNC);
-       LASSERTF(LADVISE_MAGIC == 450829536, "found %lld\n",
-                (long long)LADVISE_MAGIC);
+       BUILD_BUG_ON(LF_ASYNC != 0x00000001);
+       BUILD_BUG_ON(LF_UNSET != 0x00000002);
+       BUILD_BUG_ON(LADVISE_MAGIC != 0x1adf1ce0);
 
        /* Checks for struct lustre_handle */
        LASSERTF((int)sizeof(struct lustre_handle) == 8, "found %lld\n",
@@ -883,7 +898,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_slv));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv));
-       CLASSERT(PTLRPC_NUM_VERSIONS == 4);
+       BUILD_BUG_ON(PTLRPC_NUM_VERSIONS != 4);
        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == 88, "found %lld\n",
                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == 32, "found %lld\n",
@@ -904,7 +919,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding64_2));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding64_2));
-       CLASSERT(LUSTRE_JOBID_SIZE == 32);
+       BUILD_BUG_ON(LUSTRE_JOBID_SIZE != 32);
        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_jobid) == 152, "found %lld\n",
                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_jobid));
        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid) == 32, "found %lld\n",
@@ -1303,6 +1318,8 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT_PINGLESS);
        LASSERTF(OBD_CONNECT_FLOCK_DEAD == 0x8000000000000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT_FLOCK_DEAD);
+       LASSERTF(OBD_CONNECT_DISP_STRIPE == 0x10000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_DISP_STRIPE);
        LASSERTF(OBD_CONNECT_OPEN_BY_FID == 0x20000000000000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT_OPEN_BY_FID);
        LASSERTF(OBD_CONNECT_LFSCK == 0x40000000000000ULL, "found 0x%.16llxULL\n",
@@ -1315,8 +1332,6 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT_DIR_STRIPE);
        LASSERTF(OBD_CONNECT_SUBTREE == 0x800000000000000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT_SUBTREE);
-       LASSERTF(OBD_CONNECT_LOCKAHEAD_OLD == 0x1000000000000000ULL, "found 0x%.16llxULL\n",
-                OBD_CONNECT_LOCKAHEAD_OLD);
        LASSERTF(OBD_CONNECT_BULK_MBITS == 0x2000000000000000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT_BULK_MBITS);
        LASSERTF(OBD_CONNECT_OBDOPACK == 0x4000000000000000ULL, "found 0x%.16llxULL\n",
@@ -1349,10 +1364,12 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT2_LSOM);
        LASSERTF(OBD_CONNECT2_PCC == 0x1000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_PCC);
-       LASSERTF(OBD_CONNECT2_PLAIN_LAYOUT == 0x2000ULL, "found 0x%.16llxULL\n",
-                OBD_CONNECT2_PLAIN_LAYOUT);
+       LASSERTF(OBD_CONNECT2_CRUSH == 0x2000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_CRUSH);
        LASSERTF(OBD_CONNECT2_ASYNC_DISCARD == 0x4000ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_ASYNC_DISCARD);
+       LASSERTF(OBD_CONNECT2_ENCRYPT == 0x8000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_ENCRYPT);
        LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)OBD_CKSUM_CRC32);
        LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
@@ -1543,6 +1560,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLGID);
        LASSERTF(OBD_MD_FLFLAGS == (0x00000800ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLFLAGS);
+       LASSERTF(OBD_MD_DOM_SIZE == (0X00001000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_DOM_SIZE);
        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLNLINK);
        LASSERTF(OBD_MD_FLPARENT == (0x00004000ULL), "found 0x%.16llxULL\n",
@@ -1557,6 +1576,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLHANDLE);
        LASSERTF(OBD_MD_FLCKSUM == (0x00100000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCKSUM);
+       LASSERTF(OBD_MD_FLPRJQUOTA == (0x00400000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLPRJQUOTA);
        LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGROUP);
        LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
@@ -1585,10 +1606,14 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLXATTRRM);
        LASSERTF(OBD_MD_FLACL == (0x0000008000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLACL);
+       LASSERTF(OBD_MD_FLAGSTATFS == (0x0000010000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLAGSTATFS);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGETATTRLOCK);
+       LASSERTF(OBD_MD_FLOBJCOUNT == (0x0000400000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLOBJCOUNT);
        LASSERTF(OBD_MD_FLDATAVERSION == (0x0010000000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLDATAVERSION);
        LASSERTF(OBD_MD_CLOSE_INTENT_EXECED == (0x0020000000000000ULL), "found 0x%.16llxULL\n",
@@ -1599,31 +1624,38 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLOSTLAYOUT);
        LASSERTF(OBD_MD_FLPROJID == (0x0100000000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLPROJID);
-       CLASSERT(OBD_FL_INLINEDATA == 0x00000001);
-       CLASSERT(OBD_FL_OBDMDEXISTS == 0x00000002);
-       CLASSERT(OBD_FL_DELORPHAN == 0x00000004);
-       CLASSERT(OBD_FL_NORPC == 0x00000008);
-       CLASSERT(OBD_FL_IDONLY == 0x00000010);
-       CLASSERT(OBD_FL_RECREATE_OBJS == 0x00000020);
-       CLASSERT(OBD_FL_DEBUG_CHECK == 0x00000040);
-       CLASSERT(OBD_FL_NO_USRQUOTA == 0x00000100);
-       CLASSERT(OBD_FL_NO_GRPQUOTA == 0x00000200);
-       CLASSERT(OBD_FL_CREATE_CROW == 0x00000400);
-       CLASSERT(OBD_FL_SRVLOCK == 0x00000800);
-       CLASSERT(OBD_FL_CKSUM_CRC32 == 0x00001000);
-       CLASSERT(OBD_FL_CKSUM_ADLER == 0x00002000);
-       CLASSERT(OBD_FL_CKSUM_CRC32C == 0x00004000);
-       CLASSERT(OBD_FL_CKSUM_T10IP512 == 0x00005000);
-       CLASSERT(OBD_FL_CKSUM_T10IP4K == 0x00006000);
-       CLASSERT(OBD_FL_CKSUM_T10CRC512 == 0x00007000);
-       CLASSERT(OBD_FL_CKSUM_T10CRC4K == 0x00008000);
-       CLASSERT(OBD_FL_CKSUM_RSVD3 == 0x00010000);
-       CLASSERT(OBD_FL_SHRINK_GRANT == 0x00020000);
-       CLASSERT(OBD_FL_MMAP == 0x00040000);
-       CLASSERT(OBD_FL_RECOV_RESEND == 0x00080000);
-       CLASSERT(OBD_FL_NOSPC_BLK == 0x00100000);
-       CLASSERT(OBD_FL_FLUSH == 0x00200000);
-       CLASSERT(OBD_FL_SHORT_IO == 0x00400000);
+       LASSERTF(OBD_MD_SECCTX == (0x0200000000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_SECCTX);
+       LASSERTF(OBD_MD_FLLAZYSIZE == (0x0400000000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLLAZYSIZE);
+       LASSERTF(OBD_MD_FLLAZYBLOCKS == (0x0800000000000000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLLAZYBLOCKS);
+       BUILD_BUG_ON(OBD_FL_INLINEDATA != 0x00000001);
+       BUILD_BUG_ON(OBD_FL_OBDMDEXISTS != 0x00000002);
+       BUILD_BUG_ON(OBD_FL_DELORPHAN != 0x00000004);
+       BUILD_BUG_ON(OBD_FL_NORPC != 0x00000008);
+       BUILD_BUG_ON(OBD_FL_IDONLY != 0x00000010);
+       BUILD_BUG_ON(OBD_FL_RECREATE_OBJS != 0x00000020);
+       BUILD_BUG_ON(OBD_FL_DEBUG_CHECK != 0x00000040);
+       BUILD_BUG_ON(OBD_FL_NO_PRJQUOTA != 0x00000080);
+       BUILD_BUG_ON(OBD_FL_NO_USRQUOTA != 0x00000100);
+       BUILD_BUG_ON(OBD_FL_NO_GRPQUOTA != 0x00000200);
+       BUILD_BUG_ON(OBD_FL_CREATE_CROW != 0x00000400);
+       BUILD_BUG_ON(OBD_FL_SRVLOCK != 0x00000800);
+       BUILD_BUG_ON(OBD_FL_CKSUM_CRC32 != 0x00001000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_ADLER != 0x00002000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_CRC32C != 0x00004000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_T10IP512 != 0x00005000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_T10IP4K != 0x00006000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_T10CRC512 != 0x00007000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_T10CRC4K != 0x00008000);
+       BUILD_BUG_ON(OBD_FL_CKSUM_RSVD3 != 0x00010000);
+       BUILD_BUG_ON(OBD_FL_SHRINK_GRANT != 0x00020000);
+       BUILD_BUG_ON(OBD_FL_MMAP != 0x00040000);
+       BUILD_BUG_ON(OBD_FL_RECOV_RESEND != 0x00080000);
+       BUILD_BUG_ON(OBD_FL_NOSPC_BLK != 0x00100000);
+       BUILD_BUG_ON(OBD_FL_FLUSH != 0x00200000);
+       BUILD_BUG_ON(OBD_FL_SHORT_IO != 0x00400000);
 
        /* Checks for struct lov_ost_data_v1 */
        LASSERTF((int)sizeof(struct lov_ost_data_v1) == 24, "found %lld\n",
@@ -1672,7 +1704,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_mds_md_v1, lmm_objects[0]));
        LASSERTF((int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects[0]) == 24, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_mds_md_v1 *)0)->lmm_objects[0]));
-       CLASSERT(LOV_MAGIC_V1 == (0x0BD10000 | 0x0BD0));
+       BUILD_BUG_ON(LOV_MAGIC_V1 != (0x0BD10000 | 0x0BD0));
 
        /* Checks for struct lov_mds_md_v3 */
        LASSERTF((int)sizeof(struct lov_mds_md_v3) == 48, "found %lld\n",
@@ -1701,7 +1733,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_layout_gen));
        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen) == 2, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_layout_gen));
-       CLASSERT(LOV_MAXPOOLNAME == 15);
+       BUILD_BUG_ON(LOV_MAXPOOLNAME != 15);
        LASSERTF((int)offsetof(struct lov_mds_md_v3, lmm_pool_name[15 + 1]) == 48, "found %lld\n",
                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_pool_name[15 + 1]));
        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_pool_name[15 + 1]) == 1, "found %lld\n",
@@ -1710,7 +1742,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_mds_md_v3, lmm_objects[0]));
        LASSERTF((int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects[0]) == 24, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_mds_md_v3 *)0)->lmm_objects[0]));
-       CLASSERT(LOV_MAGIC_V3 == (0x0BD30000 | 0x0BD0));
+       BUILD_BUG_ON(LOV_MAGIC_V3 != (0x0BD30000 | 0x0BD0));
        LASSERTF(LOV_PATTERN_RAID0 == 0x00000001UL, "found 0x%.8xUL\n",
                (unsigned)LOV_PATTERN_RAID0);
        LASSERTF(LOV_PATTERN_RAID1 == 0x00000002UL, "found 0x%.8xUL\n",
@@ -1755,10 +1787,15 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_comp_md_entry_v1, lcme_padding_1));
        LASSERTF((int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_padding_1) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_padding_1));
-       LASSERTF(LCME_FL_INIT == 0x00000010UL, "found 0x%.8xUL\n",
-               (unsigned)LCME_FL_INIT);
-       LASSERTF(LCME_FL_NEG == 0x80000000UL, "found 0x%.8xUL\n",
-               (unsigned)LCME_FL_NEG);
+       BUILD_BUG_ON(LCME_FL_STALE != 0x00000001);
+       BUILD_BUG_ON(LCME_FL_PREF_RD != 0x00000002);
+       BUILD_BUG_ON(LCME_FL_PREF_WR != 0x00000004);
+       BUILD_BUG_ON(LCME_FL_PREF_RW != 0x00000006);
+       BUILD_BUG_ON(LCME_FL_OFFLINE != 0x00000008);
+       BUILD_BUG_ON(LCME_FL_INIT != 0x00000010);
+       BUILD_BUG_ON(LCME_FL_NOSYNC != 0x00000020);
+       BUILD_BUG_ON(LCME_FL_EXTENSION != 0x00000040);
+       BUILD_BUG_ON(LCME_FL_NEG != 0x80000000);
 
        /* Checks for struct lov_comp_md_v1 */
        LASSERTF((int)sizeof(struct lov_comp_md_v1) == 32, "found %lld\n",
@@ -1799,7 +1836,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_comp_md_v1, lcm_entries[0]));
        LASSERTF((int)sizeof(((struct lov_comp_md_v1 *)0)->lcm_entries[0]) == 48, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_comp_md_v1 *)0)->lcm_entries[0]));
-       CLASSERT(LOV_MAGIC_COMP_V1 == (0x0BD60000 | 0x0BD0));
+       BUILD_BUG_ON(LOV_MAGIC_COMP_V1 != (0x0BD60000 | 0x0BD0));
        LASSERTF(LCM_FL_NONE == 0, "found %lld\n",
                 (long long)LCM_FL_NONE);
        LASSERTF(LCM_FL_RDONLY == 1, "found %lld\n",
@@ -1856,13 +1893,13 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lmv_mds_md_v1, lmv_stripe_fids[0]));
        LASSERTF((int)sizeof(((struct lmv_mds_md_v1 *)0)->lmv_stripe_fids[0]) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct lmv_mds_md_v1 *)0)->lmv_stripe_fids[0]));
-       CLASSERT(LMV_MAGIC_V1 == 0x0CD20CD0);
-       CLASSERT(LMV_MAGIC_STRIPE == 0x0CD40CD0);
-       CLASSERT(LMV_HASH_TYPE_MASK == 0x0000ffff);
-       CLASSERT(LMV_HASH_FLAG_MIGRATION == 0x80000000);
-       CLASSERT(LMV_HASH_FLAG_DEAD == 0x40000000);
-       CLASSERT(LMV_HASH_FLAG_BAD_TYPE == 0x20000000);
-       CLASSERT(LMV_HASH_FLAG_LOST_LMV == 0x10000000);
+       BUILD_BUG_ON(LMV_MAGIC_V1 != 0x0CD20CD0);
+       BUILD_BUG_ON(LMV_MAGIC_STRIPE != 0x0CD40CD0);
+       BUILD_BUG_ON(LMV_HASH_TYPE_MASK != 0x0000ffff);
+       BUILD_BUG_ON(LMV_HASH_FLAG_LOST_LMV != 0x10000000);
+       BUILD_BUG_ON(LMV_HASH_FLAG_BAD_TYPE != 0x20000000);
+       BUILD_BUG_ON(LMV_HASH_FLAG_MIGRATION != 0x80000000);
+       BUILD_BUG_ON(LMV_CRUSH_PG_COUNT != 4096);
 
        /* Checks for struct obd_statfs */
        LASSERTF((int)sizeof(struct obd_statfs) == 144, "found %lld\n",
@@ -1947,20 +1984,20 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct obd_statfs, os_spare9));
        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_spare9) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_spare9));
-       LASSERTF(OS_STATE_DEGRADED == 0x1, "found %lld\n",
-                (long long)OS_STATE_DEGRADED);
-       LASSERTF(OS_STATE_READONLY == 0x2, "found %lld\n",
-                (long long)OS_STATE_READONLY);
-       LASSERTF(OS_STATE_NOPRECREATE == 0x4, "found %lld\n",
-                (long long)OS_STATE_NOPRECREATE);
-       LASSERTF(OS_STATE_ENOSPC == 0x20, "found %lld\n",
-                (long long)OS_STATE_ENOSPC);
-       LASSERTF(OS_STATE_ENOINO == 0x40, "found %lld\n",
-                (long long)OS_STATE_ENOINO);
-       LASSERTF(OS_STATE_SUM == 0x100, "found %lld\n",
-                (long long)OS_STATE_SUM);
-       LASSERTF(OS_STATE_NONROT == 0x200, "found %lld\n",
-                (long long)OS_STATE_NONROT);
+       LASSERTF(OS_STATE_DEGRADED == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_DEGRADED);
+       LASSERTF(OS_STATE_READONLY == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_READONLY);
+       LASSERTF(OS_STATE_NOPRECREATE == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_NOPRECREATE);
+       LASSERTF(OS_STATE_ENOSPC == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_ENOSPC);
+       LASSERTF(OS_STATE_ENOINO == 0x00000040UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_ENOINO);
+       LASSERTF(OS_STATE_SUM == 0x00000100UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_SUM);
+       LASSERTF(OS_STATE_NONROT == 0x00000200UL, "found 0x%.8xUL\n",
+               (unsigned)OS_STATE_NONROT);
 
        /* Checks for struct obd_ioobj */
        LASSERTF((int)sizeof(struct obd_ioobj) == 24, "found %lld\n",
@@ -2190,7 +2227,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct idx_info, ii_pad3));
        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad3) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad3));
-       CLASSERT(IDX_INFO_MAGIC == 0x3D37CC37);
+       BUILD_BUG_ON(IDX_INFO_MAGIC != 0x3D37CC37);
 
        /* Checks for struct lu_idxpage */
        LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
@@ -2211,17 +2248,13 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lu_idxpage, lip_pad0));
        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_pad0) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_pad0));
-       CLASSERT(LIP_MAGIC == 0x8A6D6B6C);
-       LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
-                (long long)LIP_HDR_SIZE);
-       LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
-                (long long)II_FL_NOHASH);
-       LASSERTF(II_FL_VARKEY == 2, "found %lld\n",
-                (long long)II_FL_VARKEY);
-       LASSERTF(II_FL_VARREC == 4, "found %lld\n",
-                (long long)II_FL_VARREC);
-       LASSERTF(II_FL_NONUNQ == 8, "found %lld\n",
-                (long long)II_FL_NONUNQ);
+       BUILD_BUG_ON(LIP_MAGIC != 0x8A6D6B6C);
+       BUILD_BUG_ON(LIP_HDR_SIZE != (__builtin_offsetof (struct lu_idxpage, lip_entries)));
+       BUILD_BUG_ON(II_FL_NOHASH != 0x00000001);
+       BUILD_BUG_ON(II_FL_VARKEY != 0x00000002);
+       BUILD_BUG_ON(II_FL_VARREC != 0x00000004);
+       BUILD_BUG_ON(II_FL_NONUNQ != 0x00000008);
+       BUILD_BUG_ON(II_FL_NOKEY != 0x00000010);
 
        /* Checks for struct niobuf_remote */
        LASSERTF((int)sizeof(struct niobuf_remote) == 16, "found %lld\n",
@@ -2242,6 +2275,8 @@ void lustre_assert_wire_constants(void)
                OBD_BRW_READ);
        LASSERTF(OBD_BRW_WRITE == 0x02, "found 0x%.8x\n",
                OBD_BRW_WRITE);
+       LASSERTF(OBD_BRW_NDELAY == 0x04, "found 0x%.8x\n",
+               OBD_BRW_NDELAY);
        LASSERTF(OBD_BRW_SYNC == 0x08, "found 0x%.8x\n",
                OBD_BRW_SYNC);
        LASSERTF(OBD_BRW_CHECK == 0x10, "found 0x%.8x\n",
@@ -2266,6 +2301,10 @@ void lustre_assert_wire_constants(void)
                OBD_BRW_OVER_GRPQUOTA);
        LASSERTF(OBD_BRW_SOFT_SYNC == 0x4000, "found 0x%.8x\n",
                OBD_BRW_SOFT_SYNC);
+       LASSERTF(OBD_BRW_OVER_PRJQUOTA == 0x8000, "found 0x%.8x\n",
+               OBD_BRW_OVER_PRJQUOTA);
+       LASSERTF(OBD_BRW_RDMA_ONLY == 0x20000, "found 0x%.8x\n",
+               OBD_BRW_RDMA_ONLY);
 
        /* Checks for struct ost_body */
        LASSERTF((int)sizeof(struct ost_body) == 208, "found %lld\n",
@@ -2317,6 +2356,12 @@ void lustre_assert_wire_constants(void)
                (unsigned)MDS_CLOSE_RESYNC_DONE);
        LASSERTF(MDS_CLOSE_LAYOUT_SPLIT == 0x00020000UL, "found 0x%.8xUL\n",
                (unsigned)MDS_CLOSE_LAYOUT_SPLIT);
+       LASSERTF(MDS_TRUNC_KEEP_LEASE == 0x00040000UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_TRUNC_KEEP_LEASE);
+       LASSERTF(MDS_PCC_ATTACH == 0x00080000UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_PCC_ATTACH);
+       LASSERTF(MDS_CLOSE_UPDATE_TIMES == 0x00100000UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_CLOSE_UPDATE_TIMES);
 
        /* Checks for struct mdt_body */
        LASSERTF((int)sizeof(struct mdt_body) == 216, "found %lld\n",
@@ -2495,6 +2540,12 @@ void lustre_assert_wire_constants(void)
                        (long long)MDS_OPEN_NEWSTRIPE);
        LASSERTF(MDS_OPEN_VOLATILE == 00000000000400000000000ULL, "found 0%.22lloULL\n",
                        (long long)MDS_OPEN_VOLATILE);
+       LASSERTF(MDS_OPEN_LEASE == 00000000001000000000000ULL, "found 0%.22lloULL\n",
+                       (long long)MDS_OPEN_LEASE);
+       LASSERTF(MDS_OPEN_RESYNC == 00000000004000000000000ULL, "found 0%.22lloULL\n",
+                       (long long)MDS_OPEN_RESYNC);
+       LASSERTF(MDS_OPEN_PCC == 00000000010000000000000ULL, "found 0%.22lloULL\n",
+                       (long long)MDS_OPEN_PCC);
        LASSERTF(LUSTRE_SYNC_FL == 0x00000008UL, "found 0x%.8xUL\n",
                (unsigned)LUSTRE_SYNC_FL);
        LASSERTF(LUSTRE_IMMUTABLE_FL == 0x00000010UL, "found 0x%.8xUL\n",
@@ -2513,18 +2564,24 @@ void lustre_assert_wire_constants(void)
                (unsigned)LUSTRE_DIRSYNC_FL);
        LASSERTF(LUSTRE_TOPDIR_FL == 0x00020000UL, "found 0x%.8xUL\n",
                (unsigned)LUSTRE_TOPDIR_FL);
-       LASSERTF(LUSTRE_DIRECTIO_FL == 0x00100000UL, "found 0x%.8xUL\n",
-               (unsigned)LUSTRE_DIRECTIO_FL);
        LASSERTF(LUSTRE_INLINE_DATA_FL == 0x10000000UL, "found 0x%.8xUL\n",
                (unsigned)LUSTRE_INLINE_DATA_FL);
-       LASSERTF(MDS_INODELOCK_LOOKUP == 0x000001, "found 0x%.8x\n",
-               MDS_INODELOCK_LOOKUP);
-       LASSERTF(MDS_INODELOCK_UPDATE == 0x000002, "found 0x%.8x\n",
-               MDS_INODELOCK_UPDATE);
-       LASSERTF(MDS_INODELOCK_OPEN == 0x000004, "found 0x%.8x\n",
-               MDS_INODELOCK_OPEN);
-       LASSERTF(MDS_INODELOCK_LAYOUT == 0x000008, "found 0x%.8x\n",
-               MDS_INODELOCK_LAYOUT);
+       LASSERTF(LUSTRE_SET_SYNC_FL == 0x00040000UL, "found 0x%.8xUL\n",
+               (unsigned)LUSTRE_SET_SYNC_FL);
+       LASSERTF(MDS_INODELOCK_LOOKUP == 0x00000001UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_LOOKUP);
+       LASSERTF(MDS_INODELOCK_UPDATE == 0x00000002UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_UPDATE);
+       LASSERTF(MDS_INODELOCK_OPEN == 0x00000004UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_OPEN);
+       LASSERTF(MDS_INODELOCK_LAYOUT == 0x00000008UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_LAYOUT);
+       LASSERTF(MDS_INODELOCK_PERM == 0x00000010UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_PERM);
+       LASSERTF(MDS_INODELOCK_XATTR == 0x00000020UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_XATTR);
+       LASSERTF(MDS_INODELOCK_DOM == 0x00000040UL, "found 0x%.8xUL\n",
+               (unsigned)MDS_INODELOCK_DOM);
 
        /* Checks for struct mdt_ioepoch */
        LASSERTF((int)sizeof(struct mdt_ioepoch) == 24, "found %lld\n",
@@ -3189,6 +3246,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_rec_resync, rs_padding0));
        LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_padding0) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_resync *)0)->rs_padding0));
+       LASSERTF((int)offsetof(struct mdt_rec_resync, rs_lease_handle) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_resync, rs_lease_handle));
+       LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_lease_handle) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_resync *)0)->rs_lease_handle));
        LASSERTF((int)offsetof(struct mdt_rec_resync, rs_padding1) == 80, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_rec_resync, rs_padding1));
        LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_padding1) == 8, "found %lld\n",
@@ -3429,12 +3490,12 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_desc, ld_uuid));
        LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_uuid) == 40, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_desc *)0)->ld_uuid));
-       CLASSERT(LOV_DESC_MAGIC == 0xB0CCDE5C);
+       BUILD_BUG_ON(LOV_DESC_MAGIC != 0xB0CCDE5C);
 
        /* Checks for struct ldlm_res_id */
        LASSERTF((int)sizeof(struct ldlm_res_id) == 32, "found %lld\n",
                 (long long)(int)sizeof(struct ldlm_res_id));
-       CLASSERT(RES_NAME_SIZE == 4);
+       BUILD_BUG_ON(RES_NAME_SIZE != 4);
        LASSERTF((int)offsetof(struct ldlm_res_id, name[4]) == 32, "found %lld\n",
                 (long long)(int)offsetof(struct ldlm_res_id, name[4]));
        LASSERTF((int)sizeof(((struct ldlm_res_id *)0)->name[4]) == 8, "found %lld\n",
@@ -3499,24 +3560,17 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct ldlm_intent, opc));
        LASSERTF((int)sizeof(((struct ldlm_intent *)0)->opc) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct ldlm_intent *)0)->opc));
-       LASSERTF(IT_OPEN == 1, "found %lld\n",
-                (long long)IT_OPEN);
-       LASSERTF(IT_CREAT == 2, "found %lld\n",
-                (long long)IT_CREAT);
-       LASSERTF(IT_READDIR == 4, "found %lld\n",
-                (long long)IT_READDIR);
-       LASSERTF(IT_GETATTR == 8, "found %lld\n",
-                (long long)IT_GETATTR);
-       LASSERTF(IT_LOOKUP == 16, "found %lld\n",
-                (long long)IT_LOOKUP);
-       LASSERTF(IT_GETXATTR == 128, "found %lld\n",
-                (long long)IT_GETXATTR);
-       LASSERTF(IT_LAYOUT == 1024, "found %lld\n",
-                (long long)IT_LAYOUT);
-       LASSERTF(IT_QUOTA_DQACQ == 2048, "found %lld\n",
-                (long long)IT_QUOTA_DQACQ);
-       LASSERTF(IT_QUOTA_CONN == 4096, "found %lld\n",
-                (long long)IT_QUOTA_CONN);
+       BUILD_BUG_ON(IT_OPEN != 0x00000001);
+       BUILD_BUG_ON(IT_CREAT != 0x00000002);
+       BUILD_BUG_ON(IT_READDIR != 0x00000004);
+       BUILD_BUG_ON(IT_GETATTR != 0x00000008);
+       BUILD_BUG_ON(IT_LOOKUP != 0x00000010);
+       BUILD_BUG_ON(IT_GETXATTR != 0x00000080);
+       BUILD_BUG_ON(IT_LAYOUT != 0x00000400);
+       BUILD_BUG_ON(IT_QUOTA_DQACQ != 0x00000800);
+       BUILD_BUG_ON(IT_QUOTA_CONN != 0x00001000);
+       BUILD_BUG_ON(IT_GLIMPSE != 0x00004000);
+       BUILD_BUG_ON(IT_BRW != 0x00008000);
 
        /* Checks for struct ldlm_resource_desc */
        LASSERTF((int)sizeof(struct ldlm_resource_desc) == 40, "found %lld\n",
@@ -3756,15 +3810,6 @@ void lustre_assert_wire_constants(void)
        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));
-       CLASSERT(MGS_PARAM_MAXLEN == 1024);
-       LASSERTF((int)offsetof(struct mgs_send_param, mgs_param[1024]) == 1024, "found %lld\n",
-                (long long)(int)offsetof(struct mgs_send_param, mgs_param[1024]));
-       LASSERTF((int)sizeof(((struct mgs_send_param *)0)->mgs_param[1024]) == 1, "found %lld\n",
-                (long long)(int)sizeof(((struct mgs_send_param *)0)->mgs_param[1024]));
-
        /* Checks for struct cfg_marker */
        LASSERTF((int)sizeof(struct cfg_marker) == 160, "found %lld\n",
                 (long long)(int)sizeof(struct cfg_marker));
@@ -3812,16 +3857,18 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_logid, lgl_ogen));
        LASSERTF((int)sizeof(((struct llog_logid *)0)->lgl_ogen) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_logid *)0)->lgl_ogen));
-       CLASSERT(OST_SZ_REC == 274730752);
-       CLASSERT(MDS_UNLINK_REC == 274801668);
-       CLASSERT(MDS_UNLINK64_REC == 275325956);
-       CLASSERT(MDS_SETATTR64_REC == 275325953);
-       CLASSERT(OBD_CFG_REC == 274857984);
-       CLASSERT(LLOG_GEN_REC == 274989056);
-       CLASSERT(CHANGELOG_REC == 275120128);
-       CLASSERT(CHANGELOG_USER_REC == 275185664);
-       CLASSERT(LLOG_HDR_MAGIC == 275010873);
-       CLASSERT(LLOG_LOGID_MAGIC == 275010875);
+       BUILD_BUG_ON(OST_SZ_REC != 274730752);
+       BUILD_BUG_ON(MDS_UNLINK_REC != 274801668);
+       BUILD_BUG_ON(MDS_UNLINK64_REC != 275325956);
+       BUILD_BUG_ON(MDS_SETATTR64_REC != 275325953);
+       BUILD_BUG_ON(OBD_CFG_REC != 274857984);
+       BUILD_BUG_ON(LLOG_GEN_REC != 274989056);
+       BUILD_BUG_ON(CHANGELOG_REC != 275120128);
+       BUILD_BUG_ON(CHANGELOG_USER_REC != 275185664);
+       BUILD_BUG_ON(HSM_AGENT_REC != 275251200);
+       BUILD_BUG_ON(UPDATE_REC != 275382272);
+       BUILD_BUG_ON(LLOG_HDR_MAGIC != 275010873);
+       BUILD_BUG_ON(LLOG_LOGID_MAGIC != 275010875);
 
        /* Checks for struct llog_catid */
        LASSERTF((int)sizeof(struct llog_catid) == 32, "found %lld\n",
@@ -3993,10 +4040,54 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_tail));
        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_hdr) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_hdr), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_hdr), (int)offsetof(struct llog_setattr64_rec_v2, lsr_hdr));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_hdr), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_hdr), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_hdr));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oi) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_oi), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_oi), (int)offsetof(struct llog_setattr64_rec_v2, lsr_oi));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oi) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_oi), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oi), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_oi));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_uid), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_uid), (int)offsetof(struct llog_setattr64_rec_v2, lsr_uid));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_uid), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_uid));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid_h) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_uid_h), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_uid_h), (int)offsetof(struct llog_setattr64_rec_v2, lsr_uid_h));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid_h) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_uid_h), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid_h), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_uid_h));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_gid), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_gid), (int)offsetof(struct llog_setattr64_rec_v2, lsr_gid));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_gid), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_gid));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_gid_h) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_gid_h), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_gid_h), (int)offsetof(struct llog_setattr64_rec_v2, lsr_gid_h));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_gid_h), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_gid_h));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_valid) == (int)offsetof(struct llog_setattr64_rec_v2, lsr_valid), "%d != %d\n",
+                (int)offsetof(struct llog_setattr64_rec, lsr_valid), (int)offsetof(struct llog_setattr64_rec_v2, lsr_valid));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_valid) == (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_valid), "%d != %d\n",
+                (int)sizeof(((struct llog_setattr64_rec *)0)->lsr_valid), (int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_valid));
        LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_projid) == 56, "found %lld\n",
                 (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_projid));
        LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_projid) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_projid));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_layout_version) == 60, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_layout_version));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_layout_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_layout_version));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_padding2) == 64, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_padding2));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_padding2) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_padding2));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_padding3) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_padding3));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_padding3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_padding3));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_tail) == 80, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_tail));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_tail) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_tail));
 
        /* Checks for struct llog_size_change_rec */
        LASSERTF((int)sizeof(struct llog_size_change_rec) == 64, "found %lld\n",
@@ -4081,6 +4172,7 @@ void lustre_assert_wire_constants(void)
        /* Checks for struct changelog_ext_jobid */
        LASSERTF((int)sizeof(struct changelog_ext_jobid) == 32, "found %lld\n",
                 (long long)(int)sizeof(struct changelog_ext_jobid));
+       BUILD_BUG_ON(LUSTRE_JOBID_SIZE != 32);
        LASSERTF((int)offsetof(struct changelog_ext_jobid, cr_jobid) == 0, "found %lld\n",
                 (long long)(int)offsetof(struct changelog_ext_jobid, cr_jobid));
        LASSERTF((int)sizeof(((struct changelog_ext_jobid *)0)->cr_jobid) == 32, "found %lld\n",
@@ -4201,6 +4293,16 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid) == 40, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid));
+       BUILD_BUG_ON(LLOG_F_ZAP_WHEN_EMPTY != 0x00000001);
+       BUILD_BUG_ON(LLOG_F_IS_CAT != 0x00000002);
+       BUILD_BUG_ON(LLOG_F_IS_PLAIN != 0x00000004);
+       BUILD_BUG_ON(LLOG_F_EXT_JOBID != 0x00000008);
+       BUILD_BUG_ON(LLOG_F_IS_FIXSIZE != 0x00000010);
+       BUILD_BUG_ON(LLOG_F_EXT_EXTRA_FLAGS != 0x00000020);
+       BUILD_BUG_ON(LLOG_F_EXT_X_UIDGID != 0x00000040);
+       BUILD_BUG_ON(LLOG_F_EXT_X_NID != 0x00000080);
+       BUILD_BUG_ON(LLOG_F_EXT_X_OMODE != 0x00000100);
+       BUILD_BUG_ON(LLOG_F_EXT_X_XATTR != 0x00000200);
 
        /* Checks for struct llogd_body */
        LASSERTF((int)sizeof(struct llogd_body) == 48, "found %lld\n",
@@ -4233,27 +4335,27 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llogd_body, lgd_cur_offset));
        LASSERTF((int)sizeof(((struct llogd_body *)0)->lgd_cur_offset) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct llogd_body *)0)->lgd_cur_offset));
-       CLASSERT(LLOG_ORIGIN_HANDLE_CREATE == 501);
-       CLASSERT(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502);
-       CLASSERT(LLOG_ORIGIN_HANDLE_READ_HEADER == 503);
-       CLASSERT(LLOG_ORIGIN_HANDLE_PREV_BLOCK == 508);
-       CLASSERT(LLOG_FIRST_OPC == 501);
-       CLASSERT(LLOG_LAST_OPC == 510);
-       CLASSERT(LLOG_CONFIG_ORIG_CTXT == 0);
-       CLASSERT(LLOG_CONFIG_REPL_CTXT == 1);
-       CLASSERT(LLOG_MDS_OST_ORIG_CTXT == 2);
-       CLASSERT(LLOG_MDS_OST_REPL_CTXT == 3);
-       CLASSERT(LLOG_SIZE_ORIG_CTXT == 4);
-       CLASSERT(LLOG_SIZE_REPL_CTXT == 5);
-       CLASSERT(LLOG_TEST_ORIG_CTXT == 8);
-       CLASSERT(LLOG_TEST_REPL_CTXT == 9);
-       CLASSERT(LLOG_CHANGELOG_ORIG_CTXT == 12);
-       CLASSERT(LLOG_CHANGELOG_REPL_CTXT == 13);
-       CLASSERT(LLOG_CHANGELOG_USER_ORIG_CTXT == 14);
-       CLASSERT(LLOG_AGENT_ORIG_CTXT == 15);
-       CLASSERT(LLOG_UPDATELOG_ORIG_CTXT == 16);
-       CLASSERT(LLOG_UPDATELOG_REPL_CTXT == 17);
-       CLASSERT(LLOG_MAX_CTXTS == 18);
+       BUILD_BUG_ON(LLOG_ORIGIN_HANDLE_CREATE != 501);
+       BUILD_BUG_ON(LLOG_ORIGIN_HANDLE_NEXT_BLOCK != 502);
+       BUILD_BUG_ON(LLOG_ORIGIN_HANDLE_READ_HEADER != 503);
+       BUILD_BUG_ON(LLOG_ORIGIN_HANDLE_PREV_BLOCK != 508);
+       BUILD_BUG_ON(LLOG_FIRST_OPC != 501);
+       BUILD_BUG_ON(LLOG_LAST_OPC != 510);
+       BUILD_BUG_ON(LLOG_CONFIG_ORIG_CTXT != 0);
+       BUILD_BUG_ON(LLOG_CONFIG_REPL_CTXT != 1);
+       BUILD_BUG_ON(LLOG_MDS_OST_ORIG_CTXT != 2);
+       BUILD_BUG_ON(LLOG_MDS_OST_REPL_CTXT != 3);
+       BUILD_BUG_ON(LLOG_SIZE_ORIG_CTXT != 4);
+       BUILD_BUG_ON(LLOG_SIZE_REPL_CTXT != 5);
+       BUILD_BUG_ON(LLOG_TEST_ORIG_CTXT != 8);
+       BUILD_BUG_ON(LLOG_TEST_REPL_CTXT != 9);
+       BUILD_BUG_ON(LLOG_CHANGELOG_ORIG_CTXT != 12);
+       BUILD_BUG_ON(LLOG_CHANGELOG_REPL_CTXT != 13);
+       BUILD_BUG_ON(LLOG_CHANGELOG_USER_ORIG_CTXT != 14);
+       BUILD_BUG_ON(LLOG_AGENT_ORIG_CTXT != 15);
+       BUILD_BUG_ON(LLOG_UPDATELOG_ORIG_CTXT != 16);
+       BUILD_BUG_ON(LLOG_UPDATELOG_REPL_CTXT != 17);
+       BUILD_BUG_ON(LLOG_MAX_CTXTS != 18);
 
        /* Checks for struct llogd_conn_body */
        LASSERTF((int)sizeof(struct llogd_conn_body) == 40, "found %lld\n",
@@ -4446,12 +4548,12 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mgs_config_body, mcb_units));
        LASSERTF((int)sizeof(((struct mgs_config_body *)0)->mcb_units) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct mgs_config_body *)0)->mcb_units));
-       CLASSERT(CONFIG_T_CONFIG == 0);
-       CLASSERT(CONFIG_T_SPTLRPC == 1);
-       CLASSERT(CONFIG_T_RECOVER == 2);
-       CLASSERT(CONFIG_T_PARAMS == 3);
-       CLASSERT(CONFIG_T_NODEMAP == 4);
-       CLASSERT(CONFIG_T_BARRIER == 5);
+       BUILD_BUG_ON(CONFIG_T_CONFIG != 0);
+       BUILD_BUG_ON(CONFIG_T_SPTLRPC != 1);
+       BUILD_BUG_ON(CONFIG_T_RECOVER != 2);
+       BUILD_BUG_ON(CONFIG_T_PARAMS != 3);
+       BUILD_BUG_ON(CONFIG_T_NODEMAP != 4);
+       BUILD_BUG_ON(CONFIG_T_BARRIER != 5);
 
        /* Checks for struct mgs_config_res */
        LASSERTF((int)sizeof(struct mgs_config_res) == 16, "found %lld\n",
@@ -4465,68 +4567,6 @@ void lustre_assert_wire_constants(void)
        LASSERTF((int)sizeof(((struct mgs_config_res *)0)->mcr_size) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct mgs_config_res *)0)->mcr_size));
 
-       /* Checks for struct lustre_capa */
-       LASSERTF((int)sizeof(struct lustre_capa) == 120, "found %lld\n",
-                (long long)(int)sizeof(struct lustre_capa));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_fid) == 0, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_fid));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_fid) == 16, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_fid));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_opc) == 16, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_opc));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_opc) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_opc));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_uid) == 24, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_uid));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_uid) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_uid));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_gid) == 32, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_gid));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_gid) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_gid));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_flags) == 40, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_flags));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_flags) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_flags));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_keyid) == 44, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_keyid));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_keyid) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_keyid));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_timeout) == 48, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_timeout));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_timeout) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_timeout));
-       LASSERTF((int)offsetof(struct lustre_capa, lc_expiry) == 52, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_expiry));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_expiry) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_expiry));
-       CLASSERT(CAPA_HMAC_MAX_LEN == 64);
-       LASSERTF((int)offsetof(struct lustre_capa, lc_hmac[64]) == 120, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa, lc_hmac[64]));
-       LASSERTF((int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]) == 1, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa *)0)->lc_hmac[64]));
-
-       /* Checks for struct lustre_capa_key */
-       LASSERTF((int)sizeof(struct lustre_capa_key) == 72, "found %lld\n",
-                (long long)(int)sizeof(struct lustre_capa_key));
-       LASSERTF((int)offsetof(struct lustre_capa_key, lk_seq) == 0, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa_key, lk_seq));
-       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_seq) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_seq));
-       LASSERTF((int)offsetof(struct lustre_capa_key, lk_keyid) == 8, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa_key, lk_keyid));
-       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_keyid) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_keyid));
-       LASSERTF((int)offsetof(struct lustre_capa_key, lk_padding) == 12, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa_key, lk_padding));
-       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_padding) == 4, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_padding));
-       CLASSERT(CAPA_HMAC_KEY_MAX_LEN == 56);
-       LASSERTF((int)offsetof(struct lustre_capa_key, lk_key[56]) == 72, "found %lld\n",
-                (long long)(int)offsetof(struct lustre_capa_key, lk_key[56]));
-       LASSERTF((int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]) == 1, "found %lld\n",
-                (long long)(int)sizeof(((struct lustre_capa_key *)0)->lk_key[56]));
-
        /* Checks for struct getinfo_fid2path */
        LASSERTF((int)sizeof(struct getinfo_fid2path) == 32, "found %lld\n",
                 (long long)(int)sizeof(struct getinfo_fid2path));
@@ -4582,9 +4622,9 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct fiemap, fm_extents));
        LASSERTF((int)sizeof(((struct fiemap *)0)->fm_extents) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct fiemap *)0)->fm_extents));
-       CLASSERT(FIEMAP_FLAG_SYNC == 0x00000001);
-       CLASSERT(FIEMAP_FLAG_XATTR == 0x00000002);
-       CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000);
+       BUILD_BUG_ON(FIEMAP_FLAG_SYNC != 0x00000001);
+       BUILD_BUG_ON(FIEMAP_FLAG_XATTR != 0x00000002);
+       BUILD_BUG_ON(FIEMAP_FLAG_DEVICE_ORDER != 0x40000000);
 
        /* Checks for struct fiemap_extent */
        LASSERTF((int)sizeof(struct fiemap_extent) == 56, "found %lld\n",
@@ -4609,18 +4649,19 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct fiemap_extent, fe_reserved[0]));
        LASSERTF((int)sizeof(((struct fiemap_extent *)0)->fe_reserved[0]) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct fiemap_extent *)0)->fe_reserved[0]));
-       CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001);
-       CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002);
-       CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004);
-       CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008);
-       CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080);
-       CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100);
-       CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200);
-       CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400);
-       CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800);
-       CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000);
-       CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
-       CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
+       BUILD_BUG_ON(FIEMAP_EXTENT_LAST != 0x00000001);
+       BUILD_BUG_ON(FIEMAP_EXTENT_UNKNOWN != 0x00000002);
+       BUILD_BUG_ON(FIEMAP_EXTENT_DELALLOC != 0x00000004);
+       BUILD_BUG_ON(FIEMAP_EXTENT_ENCODED != 0x00000008);
+       BUILD_BUG_ON(FIEMAP_EXTENT_DATA_ENCRYPTED != 0x00000080);
+       BUILD_BUG_ON(FIEMAP_EXTENT_NOT_ALIGNED != 0x00000100);
+       BUILD_BUG_ON(FIEMAP_EXTENT_DATA_INLINE != 0x00000200);
+       BUILD_BUG_ON(FIEMAP_EXTENT_DATA_TAIL != 0x00000400);
+       BUILD_BUG_ON(FIEMAP_EXTENT_UNWRITTEN != 0x00000800);
+       BUILD_BUG_ON(FIEMAP_EXTENT_MERGED != 0x00001000);
+       BUILD_BUG_ON(FIEMAP_EXTENT_SHARED != 0x00002000);
+       BUILD_BUG_ON(FIEMAP_EXTENT_NO_DIRECT != 0x40000000);
+       BUILD_BUG_ON(FIEMAP_EXTENT_NET != 0x80000000);
 
 #ifdef CONFIG_FS_POSIX_ACL
        /* Checks for type posix_acl_xattr_entry */
@@ -4679,7 +4720,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct link_ea_header, leh_padding));
        LASSERTF((int)sizeof(((struct link_ea_header *)0)->leh_padding) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct link_ea_header *)0)->leh_padding));
-       CLASSERT(LINK_EA_MAGIC == 0x11EAF1DFUL);
+       BUILD_BUG_ON(LINK_EA_MAGIC != 0x11EAF1DFUL);
 
        /* Checks for struct link_ea_entry */
        LASSERTF((int)sizeof(struct link_ea_entry) == 18, "found %lld\n",
@@ -4939,6 +4980,9 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct hsm_state_set, hss_clearmask));
        LASSERTF((int)sizeof(((struct hsm_state_set *)0)->hss_clearmask) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct hsm_state_set *)0)->hss_clearmask));
+       BUILD_BUG_ON(HSS_SETMASK != 1);
+       BUILD_BUG_ON(HSS_CLEARMASK != 2);
+       BUILD_BUG_ON(HSS_ARCHIVE_ID != 4);
 
        /* Checks for struct hsm_current_action */
        LASSERTF((int)sizeof(struct hsm_current_action) == 24, "found %lld\n",
@@ -4955,6 +4999,16 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct hsm_current_action, hca_location));
        LASSERTF((int)sizeof(((struct hsm_current_action *)0)->hca_location) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct hsm_current_action *)0)->hca_location));
+       BUILD_BUG_ON(HPS_NONE != 0);
+       BUILD_BUG_ON(HPS_WAITING != 1);
+       BUILD_BUG_ON(HPS_RUNNING != 2);
+       BUILD_BUG_ON(HPS_DONE != 3);
+       BUILD_BUG_ON(HUA_NONE != 1);
+       BUILD_BUG_ON(HUA_ARCHIVE != 10);
+       BUILD_BUG_ON(HUA_RESTORE != 11);
+       BUILD_BUG_ON(HUA_RELEASE != 12);
+       BUILD_BUG_ON(HUA_REMOVE != 13);
+       BUILD_BUG_ON(HUA_CANCEL != 14);
 
        /* Checks for struct hsm_request */
        LASSERTF((int)sizeof(struct hsm_request) == 24, "found %lld\n",
@@ -5091,6 +5145,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct object_update, ou_params));
        LASSERTF((int)sizeof(((struct object_update *)0)->ou_params) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct object_update *)0)->ou_params));
+       BUILD_BUG_ON(UPDATE_FL_OST != 0x00000001);
+       BUILD_BUG_ON(UPDATE_FL_SYNC != 0x00000002);
+       BUILD_BUG_ON(UPDATE_FL_COMMITTED != 0x00000004);
+       BUILD_BUG_ON(UPDATE_FL_NOLOG != 0x00000008);
 
        /* Checks for struct object_update_request */
        LASSERTF((int)sizeof(struct object_update_request) == 8, "found %lld\n",
@@ -5111,6 +5169,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct object_update_request, ourq_updates));
        LASSERTF((int)sizeof(((struct object_update_request *)0)->ourq_updates) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct object_update_request *)0)->ourq_updates));
+       BUILD_BUG_ON(UPDATE_REQUEST_MAGIC != 0xBDDE0002);
 
        /* Checks for struct object_update_result */
        LASSERTF((int)sizeof(struct object_update_result) == 8, "found %lld\n",
@@ -5151,6 +5210,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct object_update_reply, ourp_lens));
        LASSERTF((int)sizeof(((struct object_update_reply *)0)->ourp_lens) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct object_update_reply *)0)->ourp_lens));
+       BUILD_BUG_ON(UPDATE_REPLY_MAGIC != 0x00BD0002);
 
        /* Checks for struct out_update_header */
        LASSERTF((int)sizeof(struct out_update_header) == 16, "found %lld\n",
@@ -5175,6 +5235,8 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct out_update_header, ouh_inline_data));
        LASSERTF((int)sizeof(((struct out_update_header *)0)->ouh_inline_data) == 0, "found %lld\n",
                 (long long)(int)sizeof(((struct out_update_header *)0)->ouh_inline_data));
+       BUILD_BUG_ON(OUT_UPDATE_HEADER_MAGIC != 0xBDDF0001);
+       BUILD_BUG_ON(OUT_UPDATE_MAX_INLINE_SIZE != 4096);
 
        /* Checks for struct out_update_buffer */
        LASSERTF((int)sizeof(struct out_update_buffer) == 8, "found %lld\n",
@@ -5191,10 +5253,11 @@ void lustre_assert_wire_constants(void)
        /* Checks for struct nodemap_cluster_rec */
        LASSERTF((int)sizeof(struct nodemap_cluster_rec) == 32, "found %lld\n",
                 (long long)(int)sizeof(struct nodemap_cluster_rec));
-       LASSERTF((int)offsetof(struct nodemap_cluster_rec, ncr_name) == 0, "found %lld\n",
-                (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_name));
-       LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name) == 17, "found %lld\n",
-                (long long)(int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name));
+       BUILD_BUG_ON(LUSTRE_NODEMAP_NAME_LENGTH != 16);
+       LASSERTF((int)offsetof(struct nodemap_cluster_rec, ncr_name[16 + 1]) == 17, "found %lld\n",
+                (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_name[16 + 1]));
+       LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]) == 1, "found %lld\n",
+                (long long)(int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_name[16 + 1]));
        LASSERTF((int)offsetof(struct nodemap_cluster_rec, ncr_flags) == 17, "found %lld\n",
                 (long long)(int)offsetof(struct nodemap_cluster_rec, ncr_flags));
        LASSERTF((int)sizeof(((struct nodemap_cluster_rec *)0)->ncr_flags) == 1, "found %lld\n",
@@ -5437,7 +5500,7 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)sizeof(((struct update_params *)0)->up_params));
 
        /* Checks for struct update_op */
-       LASSERTF((int)sizeof(struct update_op) == 24, "found %lld\n",
+       LASSERTF((int)sizeof(struct update_op) == 20, "found %lld\n",
                 (long long)(int)sizeof(struct update_op));
        LASSERTF((int)offsetof(struct update_op, uop_fid) == 0, "found %lld\n",
                 (long long)(int)offsetof(struct update_op, uop_fid));