Whamcloud - gitweb
LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git] / lustre / ptlrpc / wiretest.c
index 056d130..b6f561d 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>
 #include <lustre_net.h>
 #include <lustre_disk.h>
 #include <uapi/linux/lustre/lustre_lfsck_user.h>
+#include <uapi/linux/lustre/lustre_cfg.h>
 
 
 void lustre_assert_wire_constants(void)
@@ -61,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",
@@ -174,7 +175,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);
@@ -258,6 +261,8 @@ void lustre_assert_wire_constants(void)
                        (long long)MDS_ATTR_LSIZE);
        LASSERTF(MDS_ATTR_LBLOCKS == 0x0000000000040000ULL, "found 0x%.16llxULL\n",
                        (long long)MDS_ATTR_LBLOCKS);
+       LASSERTF(MDS_ATTR_OVERRIDE == 0x0000000002000000ULL, "found 0x%.16llxULL\n",
+                       (long long)MDS_ATTR_OVERRIDE);
        LASSERTF(FLD_QUERY == 900, "found %lld\n",
                 (long long)FLD_QUERY);
        LASSERTF(FLD_READ == 901, "found %lld\n",
@@ -322,24 +327,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",
@@ -880,7 +885,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",
@@ -901,7 +906,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",
@@ -1326,6 +1331,10 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT2_LOCKAHEAD);
        LASSERTF(OBD_CONNECT2_DIR_MIGRATE == 0x4ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_DIR_MIGRATE);
+       LASSERTF(OBD_CONNECT2_SUM_STATFS == 0x8ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_SUM_STATFS);
+       LASSERTF(OBD_CONNECT2_OVERSTRIPING == 0x10ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_OVERSTRIPING);
        LASSERTF(OBD_CONNECT2_FLR == 0x20ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_FLR);
        LASSERTF(OBD_CONNECT2_WBC_INTENTS == 0x40ULL, "found 0x%.16llxULL\n",
@@ -1334,6 +1343,20 @@ void lustre_assert_wire_constants(void)
                 OBD_CONNECT2_LOCK_CONVERT);
        LASSERTF(OBD_CONNECT2_ARCHIVE_ID_ARRAY == 0x100ULL, "found 0x%.16llxULL\n",
                 OBD_CONNECT2_ARCHIVE_ID_ARRAY);
+       LASSERTF(OBD_CONNECT2_INC_XID == 0x200ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_INC_XID);
+       LASSERTF(OBD_CONNECT2_SELINUX_POLICY == 0x400ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_SELINUX_POLICY);
+       LASSERTF(OBD_CONNECT2_LSOM == 0x800ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_LSOM);
+       LASSERTF(OBD_CONNECT2_PCC == 0x1000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT2_PCC);
+       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",
@@ -1526,8 +1549,8 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLFLAGS);
        LASSERTF(OBD_MD_FLNLINK == (0x00002000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLNLINK);
-       LASSERTF(OBD_MD_FLGENER == (0x00004000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLGENER);
+       LASSERTF(OBD_MD_FLPARENT == (0x00004000ULL), "found 0x%.16llxULL\n",
+                OBD_MD_FLPARENT);
        LASSERTF(OBD_MD_FLRDEV == (0x00010000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLRDEV);
        LASSERTF(OBD_MD_FLEASIZE == (0x00020000ULL), "found 0x%.16llxULL\n",
@@ -1538,14 +1561,10 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLHANDLE);
        LASSERTF(OBD_MD_FLCKSUM == (0x00100000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCKSUM);
-       LASSERTF(OBD_MD_FLQOS == (0x00200000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLQOS);
        LASSERTF(OBD_MD_FLGROUP == (0x01000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGROUP);
        LASSERTF(OBD_MD_FLFID == (0x02000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLFID);
-       LASSERTF(OBD_MD_FLEPOCH == (0x04000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLEPOCH);
        LASSERTF(OBD_MD_FLGRANT == (0x08000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLGRANT);
        LASSERTF(OBD_MD_FLDIREA == (0x10000000ULL), "found 0x%.16llxULL\n",
@@ -1558,8 +1577,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLMODEASIZE);
        LASSERTF(OBD_MD_MDS == (0x0000000100000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MDS);
-       LASSERTF(OBD_MD_REINT == (0x0000000200000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_REINT);
        LASSERTF(OBD_MD_MEA == (0x0000000400000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_MEA);
        LASSERTF(OBD_MD_TSTATE == (0x0000000800000000ULL), "found 0x%.16llxULL\n",
@@ -1572,10 +1589,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_FLXATTRRM);
        LASSERTF(OBD_MD_FLACL == (0x0000008000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLACL);
-       LASSERTF(OBD_MD_FLMDSCAPA == (0x0000020000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLMDSCAPA);
-       LASSERTF(OBD_MD_FLOSSCAPA == (0x0000040000000000ULL), "found 0x%.16llxULL\n",
-                OBD_MD_FLOSSCAPA);
        LASSERTF(OBD_MD_FLCROSSREF == (0x0000100000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLCROSSREF);
        LASSERTF(OBD_MD_FLGETATTRLOCK == (0x0000200000000000ULL), "found 0x%.16llxULL\n",
@@ -1590,31 +1603,31 @@ 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);
+       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_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",
@@ -1663,7 +1676,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",
@@ -1692,7 +1705,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",
@@ -1701,15 +1714,15 @@ 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",
                (unsigned)LOV_PATTERN_RAID1);
        LASSERTF(LOV_PATTERN_MDT == 0x00000100UL, "found 0x%.8xUL\n",
                (unsigned)LOV_PATTERN_MDT);
-       LASSERTF(LOV_PATTERN_CMOBD == 0x00000200UL, "found 0x%.8xUL\n",
-               (unsigned)LOV_PATTERN_CMOBD);
+       LASSERTF(LOV_PATTERN_OVERSTRIPING == 0x00000200UL, "found 0x%.8xUL\n",
+               (unsigned)LOV_PATTERN_OVERSTRIPING);
 
        /* Checks for struct lov_comp_md_entry_v1 */
        LASSERTF((int)sizeof(struct lov_comp_md_entry_v1) == 48, "found %lld\n",
@@ -1738,14 +1751,14 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lov_comp_md_entry_v1, lcme_layout_gen));
        LASSERTF((int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_layout_gen) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_layout_gen));
-       LASSERTF((int)offsetof(struct lov_comp_md_entry_v1, lcme_padding_1) == 36, "found %lld\n",
+       LASSERTF((int)offsetof(struct lov_comp_md_entry_v1, lcme_timestamp) == 36, "found %lld\n",
+                (long long)(int)offsetof(struct lov_comp_md_entry_v1, lcme_timestamp));
+       LASSERTF((int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_timestamp) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_timestamp));
+       LASSERTF((int)offsetof(struct lov_comp_md_entry_v1, lcme_padding_1) == 44, "found %lld\n",
                 (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((int)offsetof(struct lov_comp_md_entry_v1, lcme_padding_2) == 40, "found %lld\n",
-                (long long)(int)offsetof(struct lov_comp_md_entry_v1, lcme_padding_2));
-       LASSERTF((int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_padding_2) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lov_comp_md_entry_v1 *)0)->lcme_padding_2));
        LASSERTF(LCME_FL_INIT == 0x00000010UL, "found 0x%.8xUL\n",
                (unsigned)LCME_FL_INIT);
        LASSERTF(LCME_FL_NEG == 0x80000000UL, "found 0x%.8xUL\n",
@@ -1790,7 +1803,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",
@@ -1847,13 +1860,12 @@ 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);
 
        /* Checks for struct obd_statfs */
        LASSERTF((int)sizeof(struct obd_statfs) == 144, "found %lld\n",
@@ -1874,6 +1886,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct obd_statfs, os_bavail));
        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_bavail) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_bavail));
+       LASSERTF((int)offsetof(struct obd_statfs, os_files) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct obd_statfs, os_files));
+       LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_files) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_files));
        LASSERTF((int)offsetof(struct obd_statfs, os_ffree) == 40, "found %lld\n",
                 (long long)(int)offsetof(struct obd_statfs, os_ffree));
        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_ffree) == 8, "found %lld\n",
@@ -1890,6 +1906,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct obd_statfs, os_namelen));
        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_namelen) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct obd_statfs *)0)->os_namelen));
+       LASSERTF((int)offsetof(struct obd_statfs, os_maxbytes) == 96, "found %lld\n",
+                (long long)(int)offsetof(struct obd_statfs, os_maxbytes));
+       LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_maxbytes) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct obd_statfs *)0)->os_maxbytes));
        LASSERTF((int)offsetof(struct obd_statfs, os_state) == 104, "found %lld\n",
                 (long long)(int)offsetof(struct obd_statfs, os_state));
        LASSERTF((int)sizeof(((struct obd_statfs *)0)->os_state) == 4, "found %lld\n",
@@ -1930,6 +1950,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 == 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",
@@ -2159,7 +2193,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",
@@ -2180,7 +2214,7 @@ 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);
+       BUILD_BUG_ON(LIP_MAGIC != 0x8A6D6B6C);
        LASSERTF(LIP_HDR_SIZE == 16, "found %lld\n",
                 (long long)LIP_HDR_SIZE);
        LASSERTF(II_FL_NOHASH == 1, "found %lld\n",
@@ -2298,10 +2332,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_body, mbo_fid2));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_fid2) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_fid2));
-       LASSERTF((int)offsetof(struct mdt_body, mbo_handle) == 32, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_body, mbo_handle));
-       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_handle) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_handle));
+       LASSERTF((int)offsetof(struct mdt_body, mbo_open_handle) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_body, mbo_open_handle));
+       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_open_handle) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_open_handle));
        LASSERTF((int)offsetof(struct mdt_body, mbo_valid) == 40, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_body, mbo_valid));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_valid) == 8, "found %lld\n",
@@ -2432,8 +2466,6 @@ void lustre_assert_wire_constants(void)
                MDS_FMODE_EXEC);
        LASSERTF(MDS_OPEN_CREATED == 000000000010UL, "found 0%.11oUL\n",
                MDS_OPEN_CREATED);
-       LASSERTF(MDS_OPEN_CROSS == 000000000020UL, "found 0%.11oUL\n",
-               MDS_OPEN_CROSS);
        LASSERTF(MDS_OPEN_CREAT == 000000000100UL, "found 0%.11oUL\n",
                MDS_OPEN_CREAT);
        LASSERTF(MDS_OPEN_EXCL == 000000000200UL, "found 0%.11oUL\n",
@@ -2488,22 +2520,28 @@ void lustre_assert_wire_constants(void)
                (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(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",
                 (long long)(int)sizeof(struct mdt_ioepoch));
-       LASSERTF((int)offsetof(struct mdt_ioepoch, mio_handle) == 0, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_ioepoch, mio_handle));
-       LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_handle) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_handle));
+       LASSERTF((int)offsetof(struct mdt_ioepoch, mio_open_handle) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_ioepoch, mio_open_handle));
+       LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_open_handle) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_ioepoch *)0)->mio_open_handle));
        LASSERTF((int)offsetof(struct mdt_ioepoch, mio_unused1) == 8, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_ioepoch, mio_unused1));
        LASSERTF((int)sizeof(((struct mdt_ioepoch *)0)->mio_unused1) == 8, "found %lld\n",
@@ -2672,10 +2710,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_rec_create, cr_fid2));
        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_fid2) == 16, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_fid2));
-       LASSERTF((int)offsetof(struct mdt_rec_create, cr_old_handle) == 72, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_rec_create, cr_old_handle));
-       LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_old_handle));
+       LASSERTF((int)offsetof(struct mdt_rec_create, cr_open_handle_old) == 72, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_create, cr_open_handle_old));
+       LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_open_handle_old) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_create *)0)->cr_open_handle_old));
        LASSERTF((int)offsetof(struct mdt_rec_create, cr_time) == 80, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_rec_create, cr_time));
        LASSERTF((int)sizeof(((struct mdt_rec_create *)0)->cr_time) == 8, "found %lld\n",
@@ -3196,9 +3234,13 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_rec_resync, rs_padding8));
        LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_padding8) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_resync *)0)->rs_padding8));
-       LASSERTF((int)offsetof(struct mdt_rec_resync, rs_padding9) == 132, "found %lld\n",
+       LASSERTF((int)offsetof(struct mdt_rec_resync, rs_mirror_id) == 132, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_resync, rs_mirror_id));
+       LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_mirror_id) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_resync *)0)->rs_mirror_id));
+       LASSERTF((int)offsetof(struct mdt_rec_resync, rs_padding9) == 134, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_rec_resync, rs_padding9));
-       LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_padding9) == 4, "found %lld\n",
+       LASSERTF((int)sizeof(((struct mdt_rec_resync *)0)->rs_padding9) == 2, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_resync *)0)->rs_padding9));
 
        /* Checks for struct mdt_rec_reint */
@@ -3292,9 +3334,13 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_rec_reint, rr_umask));
        LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_umask) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_umask));
-       LASSERTF((int)offsetof(struct mdt_rec_reint, rr_padding_4) == 132, "found %lld\n",
+       LASSERTF((int)offsetof(struct mdt_rec_reint, rr_mirror_id) == 132, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_rec_reint, rr_mirror_id));
+       LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_mirror_id) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_mirror_id));
+       LASSERTF((int)offsetof(struct mdt_rec_reint, rr_padding_4) == 134, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_rec_reint, rr_padding_4));
-       LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_4) == 4, "found %lld\n",
+       LASSERTF((int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_4) == 2, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_rec_reint *)0)->rr_padding_4));
 
        /* Checks for struct lmv_desc */
@@ -3392,12 +3438,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",
@@ -3722,7 +3768,7 @@ void lustre_assert_wire_constants(void)
        /* 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);
+       BUILD_BUG_ON(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",
@@ -3775,16 +3821,16 @@ 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(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",
@@ -4196,27 +4242,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",
@@ -4409,12 +4455,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",
@@ -4463,7 +4509,7 @@ void lustre_assert_wire_constants(void)
                 (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);
+       BUILD_BUG_ON(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",
@@ -4484,7 +4530,7 @@ void lustre_assert_wire_constants(void)
                 (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);
+       BUILD_BUG_ON(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",
@@ -4545,9 +4591,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",
@@ -4572,18 +4618,18 @@ 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_NO_DIRECT != 0x40000000);
+       BUILD_BUG_ON(FIEMAP_EXTENT_NET != 0x80000000);
 
 #ifdef CONFIG_FS_POSIX_ACL
        /* Checks for type posix_acl_xattr_entry */
@@ -4642,7 +4688,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",
@@ -5468,5 +5514,146 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_update_record, lur_update_rec));
        LASSERTF((int)sizeof(((struct llog_update_record *)0)->lur_update_rec) == 32, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_update_record *)0)->lur_update_rec));
-}
 
+       /* Checks for struct lustre_cfg */
+       LASSERTF((int)sizeof(struct lustre_cfg) == 32, "found %lld\n",
+                (long long)(int)sizeof(struct lustre_cfg));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_version) == 0, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_version));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_version) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_version));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_command) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_command));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_command) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_command));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_num) == 8, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_num));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_num) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_num));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_flags) == 12, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_flags));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_flags) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_flags));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nid) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nid));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nid) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nid));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_nal) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_nal));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_nal) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_nal));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_bufcount) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_bufcount));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_bufcount));
+       LASSERTF((int)offsetof(struct lustre_cfg, lcfg_buflens[0]) == 32, "found %lld\n",
+                (long long)(int)offsetof(struct lustre_cfg, lcfg_buflens[0]));
+       LASSERTF((int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lustre_cfg *)0)->lcfg_buflens[0]));
+       LASSERTF(LCFG_ATTACH == 0x000cf001UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ATTACH);
+       LASSERTF(LCFG_DETACH == 0x000cf002UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DETACH);
+       LASSERTF(LCFG_SETUP == 0x000cf003UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SETUP);
+       LASSERTF(LCFG_CLEANUP == 0x000cf004UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_CLEANUP);
+       LASSERTF(LCFG_ADD_UUID == 0x000cf005UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_UUID);
+       LASSERTF(LCFG_DEL_UUID == 0x000cf006UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_UUID);
+       LASSERTF(LCFG_MOUNTOPT == 0x000cf007UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MOUNTOPT);
+       LASSERTF(LCFG_DEL_MOUNTOPT == 0x000cf008UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MOUNTOPT);
+       LASSERTF(LCFG_SET_TIMEOUT == 0x000cf009UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_TIMEOUT);
+       LASSERTF(LCFG_SET_UPCALL == 0x000cf00aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_UPCALL);
+       LASSERTF(LCFG_ADD_CONN == 0x000cf00bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_CONN);
+       LASSERTF(LCFG_DEL_CONN == 0x000cf00cUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_CONN);
+       LASSERTF(LCFG_LOV_ADD_OBD == 0x000cf00dUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_OBD);
+       LASSERTF(LCFG_LOV_DEL_OBD == 0x000cf00eUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_DEL_OBD);
+       LASSERTF(LCFG_PARAM == 0x000cf00fUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PARAM);
+       LASSERTF(LCFG_MARKER == 0x000cf010UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_MARKER);
+       LASSERTF(LCFG_LOG_START == 0x000ce011UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_START);
+       LASSERTF(LCFG_LOG_END == 0x000ce012UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOG_END);
+       LASSERTF(LCFG_LOV_ADD_INA == 0x000ce013UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_LOV_ADD_INA);
+       LASSERTF(LCFG_ADD_MDC == 0x000cf014UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_ADD_MDC);
+       LASSERTF(LCFG_DEL_MDC == 0x000cf015UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_DEL_MDC);
+       LASSERTF(LCFG_SPTLRPC_CONF == 0x000ce016UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SPTLRPC_CONF);
+       LASSERTF(LCFG_POOL_NEW == 0x000ce020UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_NEW);
+       LASSERTF(LCFG_POOL_ADD == 0x000ce021UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_ADD);
+       LASSERTF(LCFG_POOL_REM == 0x000ce022UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_REM);
+       LASSERTF(LCFG_POOL_DEL == 0x000ce023UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_POOL_DEL);
+       LASSERTF(LCFG_SET_LDLM_TIMEOUT == 0x000ce030UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_LDLM_TIMEOUT);
+       LASSERTF(LCFG_PRE_CLEANUP == 0x000cf031UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_PRE_CLEANUP);
+       LASSERTF(LCFG_SET_PARAM == 0x000ce032UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_SET_PARAM);
+       LASSERTF(LCFG_NODEMAP_ADD == 0x000ce040UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD);
+       LASSERTF(LCFG_NODEMAP_DEL == 0x000ce041UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL);
+       LASSERTF(LCFG_NODEMAP_ADD_RANGE == 0x000ce042UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_RANGE);
+       LASSERTF(LCFG_NODEMAP_DEL_RANGE == 0x000ce043UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_RANGE);
+       LASSERTF(LCFG_NODEMAP_ADD_UIDMAP == 0x000ce044UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_UIDMAP == 0x000ce045UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_UIDMAP);
+       LASSERTF(LCFG_NODEMAP_ADD_GIDMAP == 0x000ce046UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_DEL_GIDMAP == 0x000ce047UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_GIDMAP);
+       LASSERTF(LCFG_NODEMAP_ACTIVATE == 0x000ce048UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ACTIVATE);
+       LASSERTF(LCFG_NODEMAP_ADMIN == 0x000ce049UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADMIN);
+       LASSERTF(LCFG_NODEMAP_TRUSTED == 0x000ce050UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TRUSTED);
+       LASSERTF(LCFG_NODEMAP_SQUASH_UID == 0x000ce051UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_UID);
+       LASSERTF(LCFG_NODEMAP_SQUASH_GID == 0x000ce052UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SQUASH_GID);
+       LASSERTF(LCFG_NODEMAP_ADD_SHKEY == 0x000ce053UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_ADD_SHKEY);
+       LASSERTF(LCFG_NODEMAP_DEL_SHKEY == 0x000ce054UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DEL_SHKEY);
+       LASSERTF(LCFG_NODEMAP_TEST_NID == 0x000ce055UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_NID);
+       LASSERTF(LCFG_NODEMAP_TEST_ID == 0x000ce056UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_TEST_ID);
+       LASSERTF(LCFG_NODEMAP_SET_FILESET == 0x000ce057UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_FILESET);
+       LASSERTF(LCFG_NODEMAP_DENY_UNKNOWN == 0x000ce058UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_DENY_UNKNOWN);
+       LASSERTF(LCFG_NODEMAP_MAP_MODE == 0x000ce059UL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_MAP_MODE);
+       LASSERTF(LCFG_NODEMAP_AUDIT_MODE == 0x000ce05aUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_AUDIT_MODE);
+       LASSERTF(LCFG_NODEMAP_SET_SEPOL == 0x000ce05bUL, "found 0x%.8xUL\n",
+               (unsigned)LCFG_NODEMAP_SET_SEPOL);
+       LASSERTF(PORTALS_CFG_TYPE == 1, "found %lld\n",
+                (long long)PORTALS_CFG_TYPE);
+       LASSERTF(LUSTRE_CFG_TYPE == 123, "found %lld\n",
+                (long long)LUSTRE_CFG_TYPE);
+}