Whamcloud - gitweb
LU-1757 brw: added OBD short io connect flag
[fs/lustre-release.git] / lustre / ptlrpc / wiretest.c
index a267b5c..fd929b8 100644 (file)
@@ -40,9 +40,6 @@
 #endif
 
 #ifdef __KERNEL__
-# ifndef AUTOCONF_INCLUDED
-#  include <linux/config.h>
-# endif
 # ifdef CONFIG_FS_POSIX_ACL
 #  include <linux/fs.h>
 #  include <linux/posix_acl_xattr.h>
@@ -57,7 +54,7 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux chopin 2.6.32.wc #9 SMP Thu Feb 9 14:43:41 CST 2012 x86_64 x86_64 x86_64 
+         * running on Linux rhel6 2.6.32 #1 SMP Mon Aug 20 00:36:28 EDT 2012 x86_64 x86_64 x86_64 GNU
          * with gcc version 4.4.4 20100726 (Red Hat 4.4.4-13) (GCC)  */
 
 
@@ -229,22 +226,6 @@ void lustre_assert_wire_constants(void)
                  (unsigned)MF_SOM_AU);
         LASSERTF(MF_GETATTR_LOCK == 0x00000100UL, "found 0x%.8xUL\n",
                  (unsigned)MF_GETATTR_LOCK);
-        LASSERTF(LQUOTA_FLAGS_GRP == 1, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_GRP);
-        LASSERTF(LQUOTA_FLAGS_BLK == 2, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_BLK);
-        LASSERTF(LQUOTA_FLAGS_ADJBLK == 4, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_ADJBLK);
-        LASSERTF(LQUOTA_FLAGS_ADJINO == 8, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_ADJINO);
-        LASSERTF(LQUOTA_FLAGS_CHG_QS == 16, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_CHG_QS);
-        LASSERTF(LQUOTA_FLAGS_RECOVERY == 32, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_RECOVERY);
-        LASSERTF(LQUOTA_FLAGS_SETQUOTA == 64, "found %lld\n",
-                 (long long)LQUOTA_FLAGS_SETQUOTA);
-        LASSERTF(LQUOTA_QAQ_CREATE_LQS == 0x80000000UL, "found 0x%.8xUL\n",
-                 (unsigned)LQUOTA_QAQ_CREATE_LQS);
         LASSERTF(MDS_ATTR_MODE == 0x0000000000000001ULL, "found 0x%.16llxULL\n",
                  (long long)MDS_ATTR_MODE);
         LASSERTF(MDS_ATTR_UID == 0x0000000000000002ULL, "found 0x%.16llxULL\n",
@@ -338,14 +319,22 @@ void lustre_assert_wire_constants(void)
         CLASSERT(LDLM_MAX_TYPE == 14);
         CLASSERT(LUSTRE_RES_ID_SEQ_OFF == 0);
         CLASSERT(LUSTRE_RES_ID_VER_OID_OFF == 1);
+       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);
         LASSERTF(OBD_PING == 400, "found %lld\n",
                  (long long)OBD_PING);
         LASSERTF(OBD_LOG_CANCEL == 401, "found %lld\n",
                  (long long)OBD_LOG_CANCEL);
         LASSERTF(OBD_QC_CALLBACK == 402, "found %lld\n",
                  (long long)OBD_QC_CALLBACK);
-        LASSERTF(OBD_LAST_OPC == 403, "found %lld\n",
+        LASSERTF(OBD_IDX_READ == 403, "found %lld\n",
+                 (long long)OBD_IDX_READ);
+        LASSERTF(OBD_LAST_OPC == 404, "found %lld\n",
                  (long long)OBD_LAST_OPC);
         LASSERTF(QUOTA_DQACQ == 601, "found %lld\n",
                  (long long)QUOTA_DQACQ);
@@ -574,6 +563,8 @@ void lustre_assert_wire_constants(void)
                  (long long)LDF_COLLIDE);
         LASSERTF(LU_PAGE_SIZE == 4096, "found %lld\n",
                  (long long)LU_PAGE_SIZE);
+       LASSERTF((int)sizeof(union lu_page) == 4096, "found %lld\n",
+                (long long)(int)sizeof(union lu_page));
 
         /* Checks for struct lustre_handle */
         LASSERTF((int)sizeof(struct lustre_handle) == 8, "found %lld\n",
@@ -699,19 +690,91 @@ void lustre_assert_wire_constants(void)
         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);
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions[4]) == 120, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_pre_versions[4]));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions[4]) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions[4]));
-        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding[4]) == 152, "found %lld\n",
-                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding[4]));
-        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding[4]) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding[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",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions));
+        LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == 120, "found %lld\n",
+                 (long long)(int)offsetof(struct ptlrpc_body_v3, pb_padding));
+        LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == 32, "found %lld\n",
+                 (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding));
         CLASSERT(JOBSTATS_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",
                  (long long)(int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_jobid));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_handle) == (int)offsetof(struct ptlrpc_body_v2, pb_handle), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_handle), (int)offsetof(struct ptlrpc_body_v2, pb_handle));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_handle), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_handle), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_handle));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_type) == (int)offsetof(struct ptlrpc_body_v2, pb_type), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_type), (int)offsetof(struct ptlrpc_body_v2, pb_type));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_type), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_type), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_type));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_version) == (int)offsetof(struct ptlrpc_body_v2, pb_version), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_version), (int)offsetof(struct ptlrpc_body_v2, pb_version));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_version), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_version), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_version));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_opc) == (int)offsetof(struct ptlrpc_body_v2, pb_opc), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_opc), (int)offsetof(struct ptlrpc_body_v2, pb_opc));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_opc), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_opc), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_opc));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_status) == (int)offsetof(struct ptlrpc_body_v2, pb_status), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_status), (int)offsetof(struct ptlrpc_body_v2, pb_status));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_status), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_status), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_status));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_xid) == (int)offsetof(struct ptlrpc_body_v2, pb_last_xid), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_last_xid), (int)offsetof(struct ptlrpc_body_v2, pb_last_xid));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_xid), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_xid), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_xid));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_seen) == (int)offsetof(struct ptlrpc_body_v2, pb_last_seen), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_last_seen), (int)offsetof(struct ptlrpc_body_v2, pb_last_seen));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_seen), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_seen), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_seen));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_last_committed) == (int)offsetof(struct ptlrpc_body_v2, pb_last_committed), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_last_committed), (int)offsetof(struct ptlrpc_body_v2, pb_last_committed));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_committed), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_last_committed), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_last_committed));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_transno) == (int)offsetof(struct ptlrpc_body_v2, pb_transno), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_transno), (int)offsetof(struct ptlrpc_body_v2, pb_transno));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_transno), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_transno), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_transno));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_flags) == (int)offsetof(struct ptlrpc_body_v2, pb_flags), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_flags), (int)offsetof(struct ptlrpc_body_v2, pb_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_flags), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_flags), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_op_flags) == (int)offsetof(struct ptlrpc_body_v2, pb_op_flags), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_op_flags), (int)offsetof(struct ptlrpc_body_v2, pb_op_flags));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_op_flags), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_op_flags), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_op_flags));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt) == (int)offsetof(struct ptlrpc_body_v2, pb_conn_cnt), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_conn_cnt), (int)offsetof(struct ptlrpc_body_v2, pb_conn_cnt));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_conn_cnt), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_conn_cnt), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_conn_cnt));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_timeout) == (int)offsetof(struct ptlrpc_body_v2, pb_timeout), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_timeout), (int)offsetof(struct ptlrpc_body_v2, pb_timeout));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_timeout), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_timeout), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_timeout));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_service_time) == (int)offsetof(struct ptlrpc_body_v2, pb_service_time), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_service_time), (int)offsetof(struct ptlrpc_body_v2, pb_service_time));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_service_time), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_service_time), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_service_time));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_limit) == (int)offsetof(struct ptlrpc_body_v2, pb_limit), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_limit), (int)offsetof(struct ptlrpc_body_v2, pb_limit));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_limit), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_limit), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_limit));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_slv) == (int)offsetof(struct ptlrpc_body_v2, pb_slv), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_slv), (int)offsetof(struct ptlrpc_body_v2, pb_slv));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_slv), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_slv), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_slv));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_pre_versions) == (int)offsetof(struct ptlrpc_body_v2, pb_pre_versions), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_pre_versions), (int)offsetof(struct ptlrpc_body_v2, pb_pre_versions));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_pre_versions), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_pre_versions), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_pre_versions));
+       LASSERTF((int)offsetof(struct ptlrpc_body_v3, pb_padding) == (int)offsetof(struct ptlrpc_body_v2, pb_padding), "%d != %d\n",
+                (int)offsetof(struct ptlrpc_body_v3, pb_padding), (int)offsetof(struct ptlrpc_body_v2, pb_padding));
+       LASSERTF((int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding) == (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding), "%d != %d\n",
+                (int)sizeof(((struct ptlrpc_body_v3 *)0)->pb_padding), (int)sizeof(((struct ptlrpc_body_v2 *)0)->pb_padding));
         LASSERTF(MSG_PTLRPC_BODY_OFF == 0, "found %lld\n",
                  (long long)MSG_PTLRPC_BODY_OFF);
         LASSERTF(REQ_REC_OFF == 1, "found %lld\n",
@@ -1006,6 +1069,10 @@ void lustre_assert_wire_constants(void)
                  OBD_CONNECT_EINPROGRESS);
         LASSERTF(OBD_CONNECT_GRANT_PARAM == 0x100000000000ULL, "found 0x%.16llxULL\n",
                  OBD_CONNECT_GRANT_PARAM);
+        LASSERTF(OBD_CONNECT_LIGHTWEIGHT == 0x1000000000000ULL, "found 0x%.16llxULL\n",
+                 OBD_CONNECT_LIGHTWEIGHT);
+       LASSERTF(OBD_CONNECT_SHORTIO == 0x2000000000000ULL, "found 0x%.16llxULL\n",
+                OBD_CONNECT_SHORTIO);
         LASSERTF(OBD_CKSUM_CRC32 == 0x00000001UL, "found 0x%.8xUL\n",
                  (unsigned)OBD_CKSUM_CRC32);
         LASSERTF(OBD_CKSUM_ADLER == 0x00000002UL, "found 0x%.8xUL\n",
@@ -1453,6 +1520,15 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct obd_ioobj *)0)->ioo_bufcnt));
 
+        /* Checks for union lquota_id */
+        LASSERTF((int)sizeof(union lquota_id) == 16, "found %lld\n",
+                 (long long)(int)sizeof(union lquota_id));
+
+       LASSERTF(QUOTABLOCK_BITS == 10, "found %lld\n",
+                (long long)QUOTABLOCK_BITS);
+       LASSERTF(QUOTABLOCK_SIZE == 1024, "found %lld\n",
+                (long long)QUOTABLOCK_SIZE);
+
         /* Checks for struct obd_quotactl */
         LASSERTF((int)sizeof(struct obd_quotactl) == 112, "found %lld\n",
                  (long long)(int)sizeof(struct obd_quotactl));
@@ -1555,6 +1631,138 @@ void lustre_assert_wire_constants(void)
         LASSERTF(Q_FINVALIDATE == 0x800104, "found 0x%.8x\n",
                  Q_FINVALIDATE);
 
+        /* Checks for struct lquota_acct_rec */
+        LASSERTF((int)sizeof(struct lquota_acct_rec) == 16, "found %lld\n",
+                 (long long)(int)sizeof(struct lquota_acct_rec));
+        LASSERTF((int)offsetof(struct lquota_acct_rec, bspace) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_acct_rec, bspace));
+        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->bspace) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->bspace));
+        LASSERTF((int)offsetof(struct lquota_acct_rec, ispace) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_acct_rec, ispace));
+        LASSERTF((int)sizeof(((struct lquota_acct_rec *)0)->ispace) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_acct_rec *)0)->ispace));
+
+        /* Checks for struct lquota_glb_rec */
+        LASSERTF((int)sizeof(struct lquota_glb_rec) == 32, "found %lld\n",
+                 (long long)(int)sizeof(struct lquota_glb_rec));
+        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_hardlimit) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_hardlimit));
+        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_hardlimit));
+        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_softlimit) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_softlimit));
+        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_softlimit));
+        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_time) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_time));
+        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_time) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_time));
+        LASSERTF((int)offsetof(struct lquota_glb_rec, qbr_granted) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_glb_rec, qbr_granted));
+        LASSERTF((int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_glb_rec *)0)->qbr_granted));
+
+        /* Checks for struct lquota_slv_rec */
+        LASSERTF((int)sizeof(struct lquota_slv_rec) == 8, "found %lld\n",
+                 (long long)(int)sizeof(struct lquota_slv_rec));
+        LASSERTF((int)offsetof(struct lquota_slv_rec, qsr_granted) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_slv_rec, qsr_granted));
+        LASSERTF((int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_slv_rec *)0)->qsr_granted));
+
+        /* Checks for struct idx_info */
+        LASSERTF((int)sizeof(struct idx_info) == 80, "found %lld\n",
+                 (long long)(int)sizeof(struct idx_info));
+        LASSERTF((int)offsetof(struct idx_info, ii_magic) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_magic));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_magic) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_magic));
+        LASSERTF((int)offsetof(struct idx_info, ii_flags) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_flags));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_flags));
+        LASSERTF((int)offsetof(struct idx_info, ii_count) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_count));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_count) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_count));
+        LASSERTF((int)offsetof(struct idx_info, ii_pad0) == 10, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_pad0));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad0) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad0));
+        LASSERTF((int)offsetof(struct idx_info, ii_attrs) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_attrs));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_attrs) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_attrs));
+        LASSERTF((int)offsetof(struct idx_info, ii_fid) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_fid));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_fid));
+        LASSERTF((int)offsetof(struct idx_info, ii_version) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_version));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_version) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_version));
+        LASSERTF((int)offsetof(struct idx_info, ii_hash_start) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_hash_start));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_start) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_start));
+        LASSERTF((int)offsetof(struct idx_info, ii_hash_end) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_hash_end));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_hash_end) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_hash_end));
+        LASSERTF((int)offsetof(struct idx_info, ii_keysize) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_keysize));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_keysize) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_keysize));
+        LASSERTF((int)offsetof(struct idx_info, ii_recsize) == 58, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_recsize));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_recsize) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_recsize));
+        LASSERTF((int)offsetof(struct idx_info, ii_pad1) == 60, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_pad1));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad1));
+        LASSERTF((int)offsetof(struct idx_info, ii_pad2) == 64, "found %lld\n",
+                 (long long)(int)offsetof(struct idx_info, ii_pad2));
+        LASSERTF((int)sizeof(((struct idx_info *)0)->ii_pad2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct idx_info *)0)->ii_pad2));
+        LASSERTF((int)offsetof(struct idx_info, ii_pad3) == 72, "found %lld\n",
+                 (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);
+
+        /* Checks for struct lu_idxpage */
+        LASSERTF((int)sizeof(struct lu_idxpage) == 16, "found %lld\n",
+                 (long long)(int)sizeof(struct lu_idxpage));
+        LASSERTF((int)offsetof(struct lu_idxpage, lip_magic) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_idxpage, lip_magic));
+        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_magic) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_magic));
+        LASSERTF((int)offsetof(struct lu_idxpage, lip_flags) == 4, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_idxpage, lip_flags));
+        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_flags) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_flags));
+        LASSERTF((int)offsetof(struct lu_idxpage, lip_nr) == 6, "found %lld\n",
+                 (long long)(int)offsetof(struct lu_idxpage, lip_nr));
+        LASSERTF((int)sizeof(((struct lu_idxpage *)0)->lip_nr) == 2, "found %lld\n",
+                 (long long)(int)sizeof(((struct lu_idxpage *)0)->lip_nr));
+        LASSERTF((int)offsetof(struct lu_idxpage, lip_pad0) == 8, "found %lld\n",
+                 (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);
+
         /* Checks for struct niobuf_remote */
         LASSERTF((int)sizeof(struct niobuf_remote) == 16, "found %lld\n",
                  (long long)(int)sizeof(struct niobuf_remote));
@@ -1778,6 +1986,8 @@ void lustre_assert_wire_constants(void)
                  MDS_OPEN_SYNC);
         LASSERTF(MDS_OPEN_DIRECTORY == 000000200000UL, "found 0%.11oUL\n",
                  MDS_OPEN_DIRECTORY);
+        LASSERTF(MDS_OPEN_BY_FID == 000040000000UL, "found 0%.11oUL\n",
+                 MDS_OPEN_BY_FID);
         LASSERTF(MDS_OPEN_DELAY_CREATE == 000100000000UL, "found 0%.11oUL\n",
                  MDS_OPEN_DELAY_CREATE);
         LASSERTF(MDS_OPEN_OWNEROVERRIDE == 000200000000UL, "found 0%.11oUL\n",
@@ -2862,6 +3072,64 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
 
+        /* Checks for struct lquota_lvb */
+        LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",
+                 (long long)(int)sizeof(struct lquota_lvb));
+        LASSERTF((int)offsetof(struct lquota_lvb, lvb_flags) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_lvb, lvb_flags));
+        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_flags) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_flags));
+        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_may_rel) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_may_rel));
+        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_may_rel));
+        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_rel) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_rel));
+        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_rel));
+        LASSERTF(LQUOTA_FL_EDQUOT == 1, "found %lld\n",
+                 (long long)LQUOTA_FL_EDQUOT);
+        LASSERTF((int)offsetof(struct lquota_lvb, lvb_id_qunit) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_lvb, lvb_id_qunit));
+        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_id_qunit));
+        LASSERTF((int)offsetof(struct lquota_lvb, lvb_pad1) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct lquota_lvb, lvb_pad1));
+        LASSERTF((int)sizeof(((struct lquota_lvb *)0)->lvb_pad1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct lquota_lvb *)0)->lvb_pad1));
+
+        /* Checks for struct ldlm_gl_lquota_desc */
+        LASSERTF((int)sizeof(struct ldlm_gl_lquota_desc) == 64, "found %lld\n",
+                 (long long)(int)sizeof(struct ldlm_gl_lquota_desc));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_id) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_id));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_id));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_flags) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_flags));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_flags));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_ver) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_ver));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_ver));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_hardlimit));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_hardlimit));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_softlimit));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_softlimit));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad1) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad1));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad1) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad1));
+        LASSERTF((int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_gl_lquota_desc, gl_pad2));
+        LASSERTF((int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_gl_lquota_desc *)0)->gl_pad2));
+
         /* Checks for struct mgs_send_param */
         LASSERTF((int)sizeof(struct mgs_send_param) == 1024, "found %lld\n",
                  (long long)(int)sizeof(struct mgs_send_param));
@@ -2923,13 +3191,13 @@ void lustre_assert_wire_constants(void)
         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(OST_RAID1_REC == 274731008);
         CLASSERT(MDS_UNLINK_REC == 274801668);
-        CLASSERT(MDS_SETATTR_REC == 274801665);
+        CLASSERT(MDS_UNLINK64_REC == 275325956);
+        CLASSERT(MDS_SETATTR64_REC == 275325953);
         CLASSERT(OBD_CFG_REC == 274857984);
-        CLASSERT(PTL_CFG_REC == 274923520);
         CLASSERT(LLOG_GEN_REC == 274989056);
-        CLASSERT(LLOG_JOIN_REC == 275054592);
+        CLASSERT(CHANGELOG_REC == 275120128);
+        CLASSERT(CHANGELOG_USER_REC == 275185664);
         CLASSERT(LLOG_HDR_MAGIC == 275010873);
         CLASSERT(LLOG_LOGID_MAGIC == 275010875);
 
@@ -2968,10 +3236,10 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_rec_hdr, lrh_type));
         LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_type) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_type));
-        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_padding) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_rec_hdr, lrh_padding));
-        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_padding));
+        LASSERTF((int)offsetof(struct llog_rec_hdr, lrh_id) == 12, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_rec_hdr, lrh_id));
+        LASSERTF((int)sizeof(((struct llog_rec_hdr *)0)->lrh_id) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_rec_hdr *)0)->lrh_id));
 
         /* Checks for struct llog_rec_tail */
         LASSERTF((int)sizeof(struct llog_rec_tail) == 8, "found %lld\n",
@@ -3002,77 +3270,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding1));
         LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding2) == 40, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_padding2));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding2) == 4, "found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding2));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 44, "found %lld\n",
+        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding3) == 48, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_padding3));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 4, "found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding3) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding3));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding4) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding4));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding4) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding4));
-        LASSERTF((int)offsetof(struct llog_logid_rec, lid_padding5) == 52, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_logid_rec, lid_padding5));
-        LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_padding5) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_padding5));
         LASSERTF((int)offsetof(struct llog_logid_rec, lid_tail) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct llog_logid_rec, lid_tail));
         LASSERTF((int)sizeof(((struct llog_logid_rec *)0)->lid_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
 
-        /* Checks for struct llog_create_rec */
-        LASSERTF((int)sizeof(struct llog_create_rec) == 56, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_create_rec));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_hdr) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_hdr));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_hdr) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_hdr));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_fid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_fid));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_fid) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_fid));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_oid));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oid));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_oseq) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_oseq));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_oseq) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_oseq));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_padding) == 44, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_padding));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_padding));
-        LASSERTF((int)offsetof(struct llog_create_rec, lcr_tail) == 48, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_create_rec, lcr_tail));
-        LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_tail) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_tail));
-
-        /* Checks for struct llog_orphan_rec */
-        LASSERTF((int)sizeof(struct llog_orphan_rec) == 40, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_orphan_rec));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_hdr) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, lor_hdr));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_hdr) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_hdr));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_oid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, lor_oid));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_oid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_oid));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_ogen) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, lor_ogen));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_ogen) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_ogen));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_padding) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, lor_padding));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_padding));
-        LASSERTF((int)offsetof(struct llog_orphan_rec, lor_tail) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_orphan_rec, lor_tail));
-        LASSERTF((int)sizeof(((struct llog_orphan_rec *)0)->lor_tail) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_orphan_rec *)0)->lor_tail));
-
         /* Checks for struct llog_unlink_rec */
         LASSERTF((int)sizeof(struct llog_unlink_rec) == 40, "found %lld\n",
                  (long long)(int)sizeof(struct llog_unlink_rec));
@@ -3096,41 +3304,40 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_unlink_rec, lur_tail));
         LASSERTF((int)sizeof(((struct llog_unlink_rec *)0)->lur_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_tail));
-
-        /* Checks for struct llog_setattr_rec */
-        LASSERTF((int)sizeof(struct llog_setattr_rec) == 48, "found %lld\n",
-                 (long long)(int)sizeof(struct llog_setattr_rec));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_hdr) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_hdr));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_hdr) == 16, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_hdr));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oid) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_oid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_oseq) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_oseq));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_oseq) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_oseq));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_uid) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_uid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_uid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_gid) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_gid));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_gid) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_gid));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_padding) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_padding));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_padding));
-        LASSERTF((int)offsetof(struct llog_setattr_rec, lsr_tail) == 40, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr_rec, lsr_tail));
-        LASSERTF((int)sizeof(((struct llog_setattr_rec *)0)->lsr_tail) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr_rec *)0)->lsr_tail));
+        /* Checks for struct llog_unlink64_rec */
+        LASSERTF((int)sizeof(struct llog_unlink64_rec) == 64, "found %lld\n",
+                 (long long)(int)sizeof(struct llog_unlink64_rec));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_hdr) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_hdr));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_hdr));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_fid) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_fid));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_fid));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_count) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_count));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_count) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_count));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_tail) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_tail));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_tail));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding1) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding1));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding1));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding2) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding2));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding2));
+        LASSERTF((int)offsetof(struct llog_unlink64_rec, lur_padding3) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_unlink64_rec, lur_padding3));
+        LASSERTF((int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_unlink64_rec *)0)->lur_padding3));
 
         /* Checks for struct llog_setattr64_rec */
-        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 56, "found %lld\n",
+        LASSERTF((int)sizeof(struct llog_setattr64_rec) == 64, "found %lld\n",
                  (long long)(int)sizeof(struct llog_setattr64_rec));
         LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_hdr));
@@ -3142,12 +3349,8 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oid));
         LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_oseq) == 24, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_oseq));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq) == 4, "found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_oseq));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
-        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
         LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_uid) == 32, "found %lld\n",
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_uid));
         LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_uid) == 4, "found %lld\n",
@@ -3164,13 +3367,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_setattr64_rec, lsr_gid_h));
         LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_gid_h));
-        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 48, "found %lld\n",
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_padding) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_padding));
+        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_padding));
+        LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "found %lld\n",
                  (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));
 
         /* Checks for struct llog_size_change_rec */
-        LASSERTF((int)sizeof(struct llog_size_change_rec) == 48, "found %lld\n",
+        LASSERTF((int)sizeof(struct llog_size_change_rec) == 64, "found %lld\n",
                  (long long)(int)sizeof(struct llog_size_change_rec));
         LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_hdr));
@@ -3184,11 +3391,19 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_ioepoch));
         LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch) == 4, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_ioepoch));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding) == 36, "found %lld\n",
-                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 40, "found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding1) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding1));
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding1));
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding2) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding2));
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding2));
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_padding3) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct llog_size_change_rec, lsc_padding3));
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_padding3));
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_tail));
         LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_tail));
@@ -3338,7 +3553,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_gen *)0)->conn_cnt));
 
         /* Checks for struct llog_gen_rec */
-        LASSERTF((int)sizeof(struct llog_gen_rec) == 40, "found %lld\n",
+        LASSERTF((int)sizeof(struct llog_gen_rec) == 64, "found %lld\n",
                  (long long)(int)sizeof(struct llog_gen_rec));
         LASSERTF((int)offsetof(struct llog_gen_rec, lgr_hdr) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_hdr));
@@ -3348,7 +3563,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_gen));
         LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_gen) == 16, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_gen));
-        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 32, "found %lld\n",
+        LASSERTF((int)offsetof(struct llog_gen_rec, lgr_tail) == 56, "found %lld\n",
                  (long long)(int)offsetof(struct llog_gen_rec, lgr_tail));
         LASSERTF((int)sizeof(((struct llog_gen_rec *)0)->lgr_tail) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_tail));
@@ -3496,53 +3711,49 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap) == 32, "found %lld\n",
                  (long long)(int)sizeof(((struct ll_fiemap_info_key *)0)->fiemap));
 
-        /* Checks for struct qunit_data */
-        LASSERTF((int)sizeof(struct qunit_data) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct qunit_data));
-        LASSERTF((int)offsetof(struct qunit_data, qd_id) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct qunit_data, qd_id));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_id));
-        LASSERTF((int)offsetof(struct qunit_data, qd_flags) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct qunit_data, qd_flags));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_flags));
-        LASSERTF((int)offsetof(struct qunit_data, qd_count) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct qunit_data, qd_count));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_count) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_count));
-        LASSERTF((int)offsetof(struct qunit_data, qd_qunit) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct qunit_data, qd_qunit));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_qunit) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_qunit));
-        LASSERTF((int)offsetof(struct qunit_data, padding) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct qunit_data, padding));
-        LASSERTF((int)sizeof(((struct qunit_data *)0)->padding) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct qunit_data *)0)->padding));
-
-        /* Checks for struct quota_adjust_qunit */
-        LASSERTF((int)sizeof(struct quota_adjust_qunit) == 32, "found %lld\n",
-                 (long long)(int)sizeof(struct quota_adjust_qunit));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_flags) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_adjust_qunit, qaq_flags));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_flags));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_id) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_adjust_qunit, qaq_id));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_id) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_id));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_bunit_sz) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_adjust_qunit, qaq_bunit_sz));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_bunit_sz) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_bunit_sz));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_adjust_qunit, qaq_iunit_sz));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->qaq_iunit_sz) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->qaq_iunit_sz));
-        LASSERTF((int)offsetof(struct quota_adjust_qunit, padding1) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct quota_adjust_qunit, padding1));
-        LASSERTF((int)sizeof(((struct quota_adjust_qunit *)0)->padding1) == 8, "found %lld\n",
-                 (long long)(int)sizeof(((struct quota_adjust_qunit *)0)->padding1));
+        /* Checks for struct quota_body */
+        LASSERTF((int)sizeof(struct quota_body) == 112, "found %lld\n",
+                 (long long)(int)sizeof(struct quota_body));
+        LASSERTF((int)offsetof(struct quota_body, qb_fid) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_fid));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_fid) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_fid));
+        LASSERTF((int)offsetof(struct quota_body, qb_id) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_id));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_id) == 16, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_id));
+        LASSERTF((int)offsetof(struct quota_body, qb_flags) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_flags));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_flags) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_flags));
+        LASSERTF((int)offsetof(struct quota_body, qb_padding) == 36, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_padding));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding));
+        LASSERTF((int)offsetof(struct quota_body, qb_count) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_count));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_count) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_count));
+        LASSERTF((int)offsetof(struct quota_body, qb_usage) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_usage));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_usage) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_usage));
+        LASSERTF((int)offsetof(struct quota_body, qb_slv_ver) == 56, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_slv_ver));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_slv_ver) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_slv_ver));
+        LASSERTF((int)offsetof(struct quota_body, qb_lockh) == 64, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_lockh));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_lockh) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_lockh));
+        LASSERTF((int)offsetof(struct quota_body, qb_glb_lockh) == 72, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_glb_lockh));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_glb_lockh) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_glb_lockh));
+        LASSERTF((int)offsetof(struct quota_body, qb_padding1[4]) == 112, "found %lld\n",
+                 (long long)(int)offsetof(struct quota_body, qb_padding1[4]));
+        LASSERTF((int)sizeof(((struct quota_body *)0)->qb_padding1[4]) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct quota_body *)0)->qb_padding1[4]));
 
         /* Checks for struct mgs_target_info */
         LASSERTF((int)sizeof(struct mgs_target_info) == 4544, "found %lld\n",
@@ -3678,66 +3889,6 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]) == 1, "found %lld\n",
                  (long long)(int)sizeof(((struct getinfo_fid2path *)0)->gf_path[0]));
 
-        /* Checks for struct lustre_disk_data */
-        LASSERTF((int)sizeof(struct lustre_disk_data) == 12288, "found %lld\n",
-                 (long long)(int)sizeof(struct lustre_disk_data));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_magic) == 0, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_magic));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_magic) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_magic));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_feature_compat) == 4, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_feature_compat));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_compat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_compat));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_feature_rocompat) == 8, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_feature_rocompat));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_rocompat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_rocompat));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_feature_incompat) == 12, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_feature_incompat));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_incompat) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_feature_incompat));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_config_ver) == 16, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_config_ver));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_config_ver) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_config_ver));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_flags) == 20, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_flags));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_flags) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_flags));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_svindex) == 24, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_svindex));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_svindex) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_svindex));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_mount_type) == 28, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_mount_type));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_mount_type) == 4, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_mount_type));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_fsname) == 32, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_fsname));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_fsname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_fsname));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_svname) == 96, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_svname));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_svname) == 64, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_svname));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_uuid) == 160, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_uuid));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_uuid) == 40, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_uuid));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_userdata) == 200, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_userdata));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata) == 824, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_mount_opts) == 4096, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_mount_opts));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_mount_opts) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_mount_opts));
-        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_params) == 8192, "found %lld\n",
-                 (long long)(int)offsetof(struct lustre_disk_data, ldd_params));
-        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_params) == 4096, "found %lld\n",
-                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_params));
-
         /* Checks for struct ll_user_fiemap */
         LASSERTF((int)sizeof(struct ll_user_fiemap) == 32, "found %lld\n",
                  (long long)(int)sizeof(struct ll_user_fiemap));