Whamcloud - gitweb
* Compiles after merging b1_4
[fs/lustre-release.git] / lustre / utils / wiretest.c
index 2cb4bb7..f802c1a 100644 (file)
@@ -25,8 +25,8 @@ int main()
 void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
-         * running on Linux build 2.4.24-cmd #1 SMP Wed Aug 18 14:24:44 MDT 2004 i686 i686 i386 GNU/L
-         * with gcc version 3.3.3 20040412 (Red Hat Linux 3.3.3-7) */
+         * running on Linux schnapps.adilger.int 2.4.28 #2 Thu Dec 16 14:35:03 MST 2004 i686 i686 i38
+         * with gcc version 3.3.2 20040108 (Red Hat Linux 3.3.2-6) */
 
 
         /* Constants... */
@@ -86,7 +86,11 @@ void lustre_assert_wire_constants(void)
                  (long long)OST_SAN_WRITE);
         LASSERTF(OST_SYNC == 16, " found %lld\n",
                  (long long)OST_SYNC);
-        LASSERTF(OST_LAST_OPC == 18, " found %lld\n",
+        LASSERTF(OST_QUOTACHECK == 18, " found %lld\n",
+                 (long long)OST_QUOTACHECK);
+        LASSERTF(OST_QUOTACTL == 19, " found %lld\n",
+                 (long long)OST_QUOTACTL);
+        LASSERTF(OST_LAST_OPC == 20, " found %lld\n",
                  (long long)OST_LAST_OPC);
         LASSERTF(OBD_OBJECT_EOF == 0xffffffffffffffffULL," found %lld\n",
                  (long long)OBD_OBJECT_EOF);
@@ -118,7 +122,13 @@ void lustre_assert_wire_constants(void)
                  (long long)MDS_SYNC);
         LASSERTF(MDS_DONE_WRITING == 45, " found %lld\n",
                  (long long)MDS_DONE_WRITING);
-        LASSERTF(MDS_LAST_OPC == 46, " found %lld\n",
+        LASSERTF(MDS_SET_INFO == 46, " found %lld\n",
+                 (long long)MDS_SET_INFO);
+        LASSERTF(MDS_QUOTACHECK == 47, " found %lld\n",
+                 (long long)MDS_QUOTACHECK);
+        LASSERTF(MDS_QUOTACTL == 48, " found %lld\n",
+                 (long long)MDS_QUOTACTL);
+        LASSERTF(MDS_LAST_OPC == 49, " found %lld\n",
                  (long long)MDS_LAST_OPC);
         LASSERTF(REINT_SETATTR == 1, " found %lld\n",
                  (long long)REINT_SETATTR);
@@ -132,7 +142,7 @@ void lustre_assert_wire_constants(void)
                  (long long)REINT_RENAME);
         LASSERTF(REINT_OPEN == 6, " found %lld\n",
                  (long long)REINT_OPEN);
-        LASSERTF(REINT_MAX == 8, " found %lld\n",
+        LASSERTF(REINT_MAX == 7, " found %lld\n",
                  (long long)REINT_MAX);
         LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
                  (long long)DISP_IT_EXECD);
@@ -200,8 +210,14 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_PING);
         LASSERTF(OBD_LOG_CANCEL == 401, " found %lld\n",
                  (long long)OBD_LOG_CANCEL);
-        LASSERTF(OBD_LAST_OPC == 402, " found %lld\n",
+        LASSERTF(OBD_QC_CALLBACK == 402, " found %lld\n",
+                 (long long)OBD_QC_CALLBACK);
+        LASSERTF(OBD_LAST_OPC == 403, " found %lld\n",
                  (long long)OBD_LAST_OPC);
+        LASSERTF(QUOTA_DQACQ == 601, " found %lld\n",
+                 (long long)QUOTA_DQACQ);
+        LASSERTF(QUOTA_DQREL == 602, " found %lld\n",
+                 (long long)QUOTA_DQREL);
         /* Sizes and Offsets */
 
 
@@ -266,92 +282,94 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct lustre_msg *)0)->buflens[7]));
 
         /* Checks for struct obdo */
-        LASSERTF((int)sizeof(struct obdo) == 176, " found %lld\n",
+        LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
                  (long long)(int)sizeof(struct obdo));
-        LASSERTF((int)offsetof(struct obdo, o_id) == 0, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_valid) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct obdo, o_valid));
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obdo *)0)->o_valid));
+        LASSERTF((int)offsetof(struct obdo, o_id) == 8, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_id));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_id) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_id));
-        LASSERTF((int)offsetof(struct obdo, o_gr) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_gr) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_gr));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_gr) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_gr));
-        LASSERTF((int)offsetof(struct obdo, o_atime) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_atime));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_atime) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_atime));
-        LASSERTF((int)offsetof(struct obdo, o_mtime) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_fid) == 24, " found %lld\n",
+                 (long long)(int)offsetof(struct obdo, o_fid));
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_fid) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obdo *)0)->o_fid));
+        LASSERTF((int)offsetof(struct obdo, o_size) == 32, " found %lld\n",
+                 (long long)(int)offsetof(struct obdo, o_size));
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_size) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obdo *)0)->o_size));
+        LASSERTF((int)offsetof(struct obdo, o_mtime) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_mtime));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_mtime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_mtime));
-        LASSERTF((int)offsetof(struct obdo, o_ctime) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_atime) == 48, " found %lld\n",
+                 (long long)(int)offsetof(struct obdo, o_atime));
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_atime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obdo *)0)->o_atime));
+        LASSERTF((int)offsetof(struct obdo, o_ctime) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_ctime));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_ctime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_ctime));
-        LASSERTF((int)offsetof(struct obdo, o_size) == 40, " found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_size));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_size) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_size));
-        LASSERTF((int)offsetof(struct obdo, o_blocks) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_blocks) == 64, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_blocks));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_blocks) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_blocks));
-        LASSERTF((int)offsetof(struct obdo, o_grant) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_grant) == 72, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_grant));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_grant) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_grant));
-        LASSERTF((int)offsetof(struct obdo, o_blksize) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_blksize) == 80, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_blksize));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_blksize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_blksize));
-        LASSERTF((int)offsetof(struct obdo, o_mode) == 68, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_mode) == 84, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_mode));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_mode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_mode));
-        LASSERTF((int)offsetof(struct obdo, o_uid) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_uid) == 88, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_uid));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_uid) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_uid));
-        LASSERTF((int)offsetof(struct obdo, o_gid) == 76, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_gid) == 92, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_gid));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_gid) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_gid));
-        LASSERTF((int)offsetof(struct obdo, o_flags) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_flags) == 96, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_flags));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_flags) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_flags));
-        LASSERTF((int)offsetof(struct obdo, o_nlink) == 84, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_nlink) == 100, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_nlink));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_nlink) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_nlink));
-        LASSERTF((int)offsetof(struct obdo, o_generation) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_generation) == 104, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_generation));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_generation) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_generation));
-        LASSERTF((int)offsetof(struct obdo, o_valid) == 92, " found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_valid));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_valid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_valid));
-        LASSERTF((int)offsetof(struct obdo, o_misc) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_misc) == 108, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_misc));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_misc) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_misc));
-        LASSERTF((int)offsetof(struct obdo, o_easize) == 100, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_easize) == 112, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_easize));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_easize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_easize));
-        LASSERTF((int)offsetof(struct obdo, o_mds) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_mds) == 116, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_mds));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_mds) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_mds));
-        LASSERTF((int)offsetof(struct obdo, o_padding) == 108, " found %lld\n",
-                 (long long)(int)offsetof(struct obdo, o_padding));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obdo *)0)->o_padding));
-        LASSERTF((int)offsetof(struct obdo, o_inline) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct obdo, o_inline) == 128, " found %lld\n",
                  (long long)(int)offsetof(struct obdo, o_inline));
-        LASSERTF((int)sizeof(((struct obdo *)0)->o_inline) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(((struct obdo *)0)->o_inline) == 80, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_inline));
+        LASSERTF(OBD_INLINESZ == 80, " found %lld\n",
+                 (long long)OBD_INLINESZ);
         LASSERTF(OBD_MD_FLID == 1, " found %lld\n",
                  (long long)OBD_MD_FLID);
         LASSERTF(OBD_MD_FLATIME == 2, " found %lld\n",
@@ -394,12 +412,26 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_MD_FLCKSUM);
         LASSERTF(OBD_MD_FLQOS == 2097152, " found %lld\n",
                  (long long)OBD_MD_FLQOS);
-        LASSERTF(OBD_MD_FLOSCOPQ == 4194304, " found %lld\n",
-                 (long long)OBD_MD_FLOSCOPQ);
         LASSERTF(OBD_MD_FLCOOKIE == 8388608, " found %lld\n",
                  (long long)OBD_MD_FLCOOKIE);
         LASSERTF(OBD_MD_FLGROUP == 16777216, " found %lld\n",
                  (long long)OBD_MD_FLGROUP);
+        LASSERTF(OBD_MD_FLIFID == 33554432, " found %lld\n",
+                 (long long)OBD_MD_FLIFID);
+        LASSERTF(OBD_MD_FLEPOCH == 67108864, " found %lld\n",
+                 (long long)OBD_MD_FLEPOCH);
+        LASSERTF(OBD_MD_FLGRANT == 134217728, " found %lld\n",
+                 (long long)OBD_MD_FLGRANT);
+        LASSERTF(OBD_MD_FLDIREA == 268435456, " found %lld\n",
+                 (long long)OBD_MD_FLDIREA);
+        LASSERTF(OBD_MD_FLUSRQUOTA == 536870912, " found %lld\n",
+                 (long long)OBD_MD_FLUSRQUOTA);
+        LASSERTF(OBD_MD_FLGRPQUOTA == 1073741824, " found %lld\n",
+                 (long long)OBD_MD_FLGRPQUOTA);
+        LASSERTF(OBD_MD_MDS == 4294967296ULL, " found %lld\n",
+                 (long long)OBD_MD_MDS);
+        LASSERTF(OBD_MD_REINT == 8589934592ULL, " found %lld\n",
+                 (long long)OBD_MD_REINT);
         LASSERTF(OBD_FL_INLINEDATA == 1, " found %lld\n",
                  (long long)OBD_FL_INLINEDATA);
         LASSERTF(OBD_FL_OBDMDEXISTS == 2, " found %lld\n",
@@ -412,6 +444,12 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_FL_IDONLY);
         LASSERTF(OBD_FL_RECREATE_OBJS == 32, " found %lld\n",
                  (long long)OBD_FL_RECREATE_OBJS);
+        LASSERTF(OBD_FL_DEBUG_CHECK == 64, " found %lld\n",
+                 (long long)OBD_FL_DEBUG_CHECK);
+        LASSERTF(OBD_FL_NO_USRQUOTA == 256, " found %lld\n",
+                 (long long)OBD_FL_NO_USRQUOTA);
+        LASSERTF(OBD_FL_NO_GRPQUOTA == 512, " found %lld\n",
+                 (long long)OBD_FL_NO_GRPQUOTA);
 
         /* Checks for struct lov_mds_md_v1 */
         LASSERTF((int)sizeof(struct lov_mds_md_v1) == 32, " found %lld\n",
@@ -464,8 +502,6 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct lov_ost_data_v1, l_ost_idx));
         LASSERTF((int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct lov_ost_data_v1 *)0)->l_ost_idx));
-        LASSERTF(LOV_MAGIC_V0 == 198183888, " found %lld\n",
-                 (long long)LOV_MAGIC_V0);
         LASSERTF(LOV_MAGIC_V1 == 198249424, " found %lld\n",
                  (long long)LOV_MAGIC_V1);
         LASSERTF(LOV_PATTERN_RAID0 == 1, " found %lld\n",
@@ -533,6 +569,94 @@ 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 struct obd_quotactl */
+        LASSERTF((int)sizeof(struct obd_quotactl) == 112, " found %lld\n",
+                 (long long)(int)sizeof(struct obd_quotactl));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_cmd) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_cmd));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_cmd) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_cmd));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_type) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_type));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_type) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_type));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_id) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_id));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_id) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_id));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_stat) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_stat));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_stat) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_stat));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqinfo) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_dqinfo));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqinfo) == 24, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_dqinfo));
+        LASSERTF((int)offsetof(struct obd_quotactl, qc_dqblk) == 40, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_quotactl, qc_dqblk));
+        LASSERTF((int)sizeof(((struct obd_quotactl *)0)->qc_dqblk) == 72, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_quotactl *)0)->qc_dqblk));
+
+        /* Checks for struct obd_dqinfo */
+        LASSERTF((int)sizeof(struct obd_dqinfo) == 24, " found %lld\n",
+                 (long long)(int)sizeof(struct obd_dqinfo));
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_bgrace) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqinfo, dqi_bgrace));
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_bgrace));
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_igrace) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqinfo, dqi_igrace));
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_igrace));
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_flags) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqinfo, dqi_flags));
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_flags) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_flags));
+        LASSERTF((int)offsetof(struct obd_dqinfo, dqi_valid) == 20, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqinfo, dqi_valid));
+        LASSERTF((int)sizeof(((struct obd_dqinfo *)0)->dqi_valid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqinfo *)0)->dqi_valid));
+
+        /* Checks for struct obd_dqblk */
+        LASSERTF((int)sizeof(struct obd_dqblk) == 72, " found %lld\n",
+                 (long long)(int)sizeof(struct obd_dqblk));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bhardlimit) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_bhardlimit));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bhardlimit));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_bsoftlimit) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_bsoftlimit));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_bsoftlimit));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curspace) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_curspace));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curspace) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curspace));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_ihardlimit) == 24, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_ihardlimit));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_ihardlimit));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_isoftlimit) == 32, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_isoftlimit));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_isoftlimit));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_curinodes) == 40, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_curinodes));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_curinodes));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_btime) == 48, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_btime));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_btime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_btime));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_itime) == 56, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_itime));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_itime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_itime));
+        LASSERTF((int)offsetof(struct obd_dqblk, dqb_valid) == 64, " found %lld\n",
+                 (long long)(int)offsetof(struct obd_dqblk, dqb_valid));
+        LASSERTF((int)sizeof(((struct obd_dqblk *)0)->dqb_valid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct obd_dqblk *)0)->dqb_valid));
+
         /* Checks for struct niobuf_remote */
         LASSERTF((int)sizeof(struct niobuf_remote) == 16, " found %lld\n",
                  (long long)(int)sizeof(struct niobuf_remote));
@@ -558,15 +682,15 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_BRW_FROM_GRANT);
 
         /* Checks for struct ost_body */
-        LASSERTF((int)sizeof(struct ost_body) == 176, " found %lld\n",
+        LASSERTF((int)sizeof(struct ost_body) == 208, " found %lld\n",
                  (long long)(int)sizeof(struct ost_body));
         LASSERTF((int)offsetof(struct ost_body, oa) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ost_body, oa));
-        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 176, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 208, " found %lld\n",
                  (long long)(int)sizeof(((struct ost_body *)0)->oa));
 
         /* Checks for struct ll_fid */
-        LASSERTF((int)sizeof(struct ll_fid) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(struct ll_fid) == 16, " found %lld\n",
                  (long long)(int)sizeof(struct ll_fid));
         LASSERTF((int)offsetof(struct ll_fid, id) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ll_fid, id));
@@ -594,88 +718,100 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_status_req *)0)->repbuf));
 
         /* Checks for struct mds_body */
-        LASSERTF((int)sizeof(struct mds_body) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_body) == 168, " found %lld\n",
                  (long long)(int)sizeof(struct mds_body));
         LASSERTF((int)offsetof(struct mds_body, fid1) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, fid1));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid1));
-        LASSERTF((int)offsetof(struct mds_body, fid2) == 24, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, fid2) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, fid2));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid2));
-        LASSERTF((int)offsetof(struct mds_body, handle) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, handle) == 32, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, handle));
         LASSERTF((int)sizeof(((struct mds_body *)0)->handle) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->handle));
-        LASSERTF((int)offsetof(struct mds_body, size) == 56, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, size) == 48, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, size));
         LASSERTF((int)sizeof(((struct mds_body *)0)->size) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->size));
-        LASSERTF((int)offsetof(struct mds_body, blocks) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, blocks) == 80, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, blocks));
         LASSERTF((int)sizeof(((struct mds_body *)0)->blocks) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->blocks));
-        LASSERTF((int)offsetof(struct mds_body, io_epoch) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, io_epoch) == 88, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, io_epoch));
         LASSERTF((int)sizeof(((struct mds_body *)0)->io_epoch) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->io_epoch));
-        LASSERTF((int)offsetof(struct mds_body, ino) == 80, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, ino) == 96, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, ino));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->ino) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->ino) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->ino));
-        LASSERTF((int)offsetof(struct mds_body, valid) == 84, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, valid) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, valid));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->valid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->valid) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->valid));
-        LASSERTF((int)offsetof(struct mds_body, mode) == 88, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, fsuid) == 104, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_body, fsuid));
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_body *)0)->fsuid));
+        LASSERTF((int)offsetof(struct mds_body, fsgid) == 108, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_body, fsgid));
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_body *)0)->fsgid));
+        LASSERTF((int)offsetof(struct mds_body, capability) == 112, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_body, capability));
+        LASSERTF((int)sizeof(((struct mds_body *)0)->capability) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_body *)0)->capability));
+        LASSERTF((int)offsetof(struct mds_body, mode) == 116, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, mode));
         LASSERTF((int)sizeof(((struct mds_body *)0)->mode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->mode));
-        LASSERTF((int)offsetof(struct mds_body, uid) == 92, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, uid) == 120, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, uid));
         LASSERTF((int)sizeof(((struct mds_body *)0)->uid) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->uid));
-        LASSERTF((int)offsetof(struct mds_body, gid) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, gid) == 124, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, gid));
         LASSERTF((int)sizeof(((struct mds_body *)0)->gid) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->gid));
-        LASSERTF((int)offsetof(struct mds_body, mtime) == 100, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, mtime) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, mtime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->mtime) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->mtime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->mtime));
-        LASSERTF((int)offsetof(struct mds_body, ctime) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, ctime) == 72, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, ctime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->ctime) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->ctime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->ctime));
-        LASSERTF((int)offsetof(struct mds_body, atime) == 108, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, atime) == 64, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, atime));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->atime) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->atime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->atime));
-        LASSERTF((int)offsetof(struct mds_body, flags) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, flags) == 128, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, flags));
         LASSERTF((int)sizeof(((struct mds_body *)0)->flags) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->flags));
-        LASSERTF((int)offsetof(struct mds_body, rdev) == 116, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, rdev) == 132, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, rdev));
         LASSERTF((int)sizeof(((struct mds_body *)0)->rdev) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->rdev));
-        LASSERTF((int)offsetof(struct mds_body, nlink) == 120, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, nlink) == 136, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, nlink));
         LASSERTF((int)sizeof(((struct mds_body *)0)->nlink) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->nlink));
-        LASSERTF((int)offsetof(struct mds_body, generation) == 124, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, generation) == 140, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, generation));
         LASSERTF((int)sizeof(((struct mds_body *)0)->generation) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->generation));
-        LASSERTF((int)offsetof(struct mds_body, eadatasize) == 128, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_body, suppgid) == 144, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_body, suppgid));
+        LASSERTF((int)sizeof(((struct mds_body *)0)->suppgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_body *)0)->suppgid));
+        LASSERTF((int)offsetof(struct mds_body, eadatasize) == 148, " found %lld\n",
                  (long long)(int)offsetof(struct mds_body, eadatasize));
         LASSERTF((int)sizeof(((struct mds_body *)0)->eadatasize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->eadatasize));
-        LASSERTF((int)offsetof(struct mds_body, mds) == 132, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_body, mds));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->mds) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_body *)0)->mds));
         LASSERTF(FMODE_READ == 1, " found %lld\n",
                  (long long)FMODE_READ);
         LASSERTF(FMODE_WRITE == 2, " found %lld\n",
@@ -700,107 +836,151 @@ void lustre_assert_wire_constants(void)
                  (long long)MDS_OPEN_HAS_EA);
 
         /* Checks for struct mds_rec_setattr */
-        LASSERTF((int)sizeof(struct mds_rec_setattr) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_rec_setattr) == 96, " found %lld\n",
                  (long long)(int)sizeof(struct mds_rec_setattr));
         LASSERTF((int)offsetof(struct mds_rec_setattr, sa_opcode) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_setattr, sa_opcode));
         LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_opcode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_opcode));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_valid) == 4, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_valid));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_valid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_valid));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_fid) == 8, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_fid));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_fid) == 24, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_fid));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_mode) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_fsuid) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_fsuid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_fsuid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_fsgid) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_fsgid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_fsgid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_cap) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_cap));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_cap) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_cap));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_suppgid) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_suppgid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_suppgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_suppgid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_mode) == 20, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_setattr, sa_mode));
         LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_mode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_mode));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_uid) == 36, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_uid));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_uid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_uid));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_gid) == 40, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_gid));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_gid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_gid));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_attr_flags) == 44, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_attr_flags));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_fid) == 24, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_fid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_fid) == 16, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_fid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_valid) == 40, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_valid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_valid) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_valid));
         LASSERTF((int)offsetof(struct mds_rec_setattr, sa_size) == 48, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_setattr, sa_size));
         LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_size) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_size));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_atime) == 56, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_setattr, sa_atime));
-        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_atime) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_atime));
-        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_mtime) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_mtime) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_setattr, sa_mtime));
         LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_mtime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_mtime));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_atime) == 64, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_atime));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_atime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_atime));
         LASSERTF((int)offsetof(struct mds_rec_setattr, sa_ctime) == 72, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_setattr, sa_ctime));
         LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_ctime) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_ctime));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_uid) == 80, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_uid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_uid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_uid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_gid) == 84, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_gid));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_gid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_gid));
+        LASSERTF((int)offsetof(struct mds_rec_setattr, sa_attr_flags) == 88, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_setattr, sa_attr_flags));
+        LASSERTF((int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_setattr *)0)->sa_attr_flags));
 
         /* Checks for struct mds_rec_create */
-        LASSERTF((int)sizeof(struct mds_rec_create) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_rec_create) == 96, " found %lld\n",
                  (long long)(int)sizeof(struct mds_rec_create));
         LASSERTF((int)offsetof(struct mds_rec_create, cr_opcode) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_opcode));
         LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_opcode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_opcode));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_flags) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_fsuid) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_create, cr_fsuid));
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_fsuid));
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_fsgid) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_create, cr_fsgid));
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_fsgid));
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_cap) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_create, cr_cap));
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_cap) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_cap));
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_flags) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_flags));
         LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_flags) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_flags));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_mode) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_mode) == 20, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_mode));
         LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_mode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_mode));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_padding) == 12, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_create, cr_padding));
-        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_padding));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_fid) == 16, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_fid) == 24, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_fid));
-        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_fid) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_fid) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_fid));
         LASSERTF((int)offsetof(struct mds_rec_create, cr_replayfid) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_replayfid));
-        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_replayfid) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_replayfid) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_replayfid));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_time) == 64, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_time) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_time));
         LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_time) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_time));
-        LASSERTF((int)offsetof(struct mds_rec_create, cr_rdev) == 72, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_rdev) == 64, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_create, cr_rdev));
         LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_rdev) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_rdev));
+        LASSERTF((int)offsetof(struct mds_rec_create, cr_suppgid) == 72, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_create, cr_suppgid));
+        LASSERTF((int)sizeof(((struct mds_rec_create *)0)->cr_suppgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_create *)0)->cr_suppgid));
 
         /* Checks for struct mds_rec_link */
-        LASSERTF((int)sizeof(struct mds_rec_link) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_rec_link) == 80, " found %lld\n",
                  (long long)(int)sizeof(struct mds_rec_link));
         LASSERTF((int)offsetof(struct mds_rec_link, lk_opcode) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_link, lk_opcode));
         LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_opcode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_opcode));
-        LASSERTF((int)offsetof(struct mds_rec_link, lk_padding) == 4, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_link, lk_padding));
-        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_padding));
-        LASSERTF((int)offsetof(struct mds_rec_link, lk_fid1) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_fsuid) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_link, lk_fsuid));
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_fsuid));
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_fsgid) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_link, lk_fsgid));
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_fsgid));
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_cap) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_link, lk_cap));
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_cap) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_cap));
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_suppgid1) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_link, lk_suppgid1));
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_suppgid1) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_suppgid1));
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_suppgid2) == 20, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_link, lk_suppgid2));
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_suppgid2) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_suppgid2));
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_fid1) == 24, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_link, lk_fid1));
-        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fid1) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fid1) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_fid1));
-        LASSERTF((int)offsetof(struct mds_rec_link, lk_fid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_link, lk_fid2) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_link, lk_fid2));
-        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fid2) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_link *)0)->lk_fid2) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_fid2));
         LASSERTF((int)offsetof(struct mds_rec_link, lk_time) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_link, lk_time));
@@ -808,23 +988,39 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_rec_link *)0)->lk_time));
 
         /* Checks for struct mds_rec_unlink */
-        LASSERTF((int)sizeof(struct mds_rec_unlink) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_rec_unlink) == 80, " found %lld\n",
                  (long long)(int)sizeof(struct mds_rec_unlink));
         LASSERTF((int)offsetof(struct mds_rec_unlink, ul_opcode) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_unlink, ul_opcode));
         LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_opcode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_opcode));
-        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_mode) == 4, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fsuid) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_unlink, ul_fsuid));
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_fsuid));
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fsgid) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_unlink, ul_fsgid));
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_fsgid));
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_cap) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_unlink, ul_cap));
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_cap) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_cap));
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_suppgid) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_unlink, ul_suppgid));
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_suppgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_suppgid));
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_mode) == 20, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_unlink, ul_mode));
         LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_mode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_mode));
-        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fid1) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fid1) == 24, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_unlink, ul_fid1));
-        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fid1) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fid1) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_fid1));
-        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_unlink, ul_fid2) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_unlink, ul_fid2));
-        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fid2) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_unlink *)0)->ul_fid2) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_fid2));
         LASSERTF((int)offsetof(struct mds_rec_unlink, ul_time) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_unlink, ul_time));
@@ -832,23 +1028,39 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_rec_unlink *)0)->ul_time));
 
         /* Checks for struct mds_rec_rename */
-        LASSERTF((int)sizeof(struct mds_rec_rename) == 64, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_rec_rename) == 80, " found %lld\n",
                  (long long)(int)sizeof(struct mds_rec_rename));
         LASSERTF((int)offsetof(struct mds_rec_rename, rn_opcode) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_rename, rn_opcode));
         LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_opcode) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_opcode));
-        LASSERTF((int)offsetof(struct mds_rec_rename, rn_padding) == 4, " found %lld\n",
-                 (long long)(int)offsetof(struct mds_rec_rename, rn_padding));
-        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_padding) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_padding));
-        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fid1) == 8, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fsuid) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_rename, rn_fsuid));
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fsuid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_fsuid));
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fsgid) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_rename, rn_fsgid));
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fsgid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_fsgid));
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_cap) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_rename, rn_cap));
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_cap) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_cap));
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_suppgid1) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_rename, rn_suppgid1));
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_suppgid1) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_suppgid1));
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_suppgid2) == 20, " found %lld\n",
+                 (long long)(int)offsetof(struct mds_rec_rename, rn_suppgid2));
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_suppgid2) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_suppgid2));
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fid1) == 24, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_rename, rn_fid1));
-        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fid1) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fid1) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_fid1));
-        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fid2) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct mds_rec_rename, rn_fid2) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_rename, rn_fid2));
-        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fid2) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_rec_rename *)0)->rn_fid2) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_fid2));
         LASSERTF((int)offsetof(struct mds_rec_rename, rn_time) == 56, " found %lld\n",
                  (long long)(int)offsetof(struct mds_rec_rename, rn_time));
@@ -856,7 +1068,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_rec_rename *)0)->rn_time));
 
         /* Checks for struct lov_desc */
-        LASSERTF((int)sizeof(struct lov_desc) == 72, " found %lld\n",
+        LASSERTF((int)sizeof(struct lov_desc) == 88, " found %lld\n",
                  (long long)(int)sizeof(struct lov_desc));
         LASSERTF((int)offsetof(struct lov_desc, ld_tgt_count) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct lov_desc, ld_tgt_count));
@@ -882,7 +1094,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct lov_desc, ld_default_stripe_offset));
         LASSERTF((int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct lov_desc *)0)->ld_default_stripe_offset));
-        LASSERTF((int)offsetof(struct lov_desc, ld_uuid) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct lov_desc, ld_uuid) == 48, " found %lld\n",
                  (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));
@@ -906,13 +1118,9 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ldlm_extent, end));
         LASSERTF((int)sizeof(((struct ldlm_extent *)0)->end) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_extent *)0)->end));
-        LASSERTF((int)offsetof(struct ldlm_extent, gid) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_extent, gid));
-        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->gid) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_extent *)0)->gid));
 
         /* Checks for struct ldlm_flock */
-        LASSERTF((int)sizeof(struct ldlm_flock) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_flock) == 32, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_flock));
         LASSERTF((int)offsetof(struct ldlm_flock, start) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock, start));
@@ -922,18 +1130,18 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ldlm_flock, end));
         LASSERTF((int)sizeof(((struct ldlm_flock *)0)->end) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock *)0)->end));
-        LASSERTF((int)offsetof(struct ldlm_flock, pid) == 16, " found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_flock, pid));
-        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->pid) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_flock *)0)->pid));
-        LASSERTF((int)offsetof(struct ldlm_flock, blocking_pid) == 24, " found %lld\n",
-                 (long long)(int)offsetof(struct ldlm_flock, blocking_pid));
-        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_pid) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_pid));
-        LASSERTF((int)offsetof(struct ldlm_flock, blocking_export) == 32, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_flock, blocking_export) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_flock, blocking_export));
         LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_export) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_export));
+        LASSERTF((int)offsetof(struct ldlm_flock, blocking_pid) == 24, " found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_flock, blocking_pid));
+        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_pid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_pid));
+        LASSERTF((int)offsetof(struct ldlm_flock, pid) == 28, " found %lld\n",
+                 (long long)(int)offsetof(struct ldlm_flock, pid));
+        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->pid) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_flock *)0)->pid));
 
         /* Checks for struct ldlm_intent */
         LASSERTF((int)sizeof(struct ldlm_intent) == 8, " found %lld\n",
@@ -956,7 +1164,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_name));
 
         /* Checks for struct ldlm_lock_desc */
-        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 88, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 80, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_lock_desc));
         LASSERTF((int)offsetof(struct ldlm_lock_desc, l_resource) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_resource));
@@ -972,11 +1180,11 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_granted_mode));
         LASSERTF((int)offsetof(struct ldlm_lock_desc, l_policy_data) == 48, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_lock_desc, l_policy_data));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 40, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 32, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data));
 
         /* Checks for struct ldlm_request */
-        LASSERTF((int)sizeof(struct ldlm_request) == 112, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_request) == 104, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_request));
         LASSERTF((int)offsetof(struct ldlm_request, lock_flags) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_flags));
@@ -984,19 +1192,19 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_flags));
         LASSERTF((int)offsetof(struct ldlm_request, lock_desc) == 8, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 88, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_handle1) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_handle1) == 88, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_handle1));
         LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle1) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle1));
-        LASSERTF((int)offsetof(struct ldlm_request, lock_handle2) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_request, lock_handle2) == 96, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_handle2));
         LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle2) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle2));
 
         /* Checks for struct ldlm_reply */
-        LASSERTF((int)sizeof(struct ldlm_reply) == 120, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_reply) == 112, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_reply));
         LASSERTF((int)offsetof(struct ldlm_reply, lock_flags) == 0, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_flags));
@@ -1004,17 +1212,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_flags));
         LASSERTF((int)offsetof(struct ldlm_request, lock_desc) == 8, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_request, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 88, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_handle) == 96, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_handle) == 88, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_handle));
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_handle) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_handle));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res1) == 104, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res1) == 96, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_policy_res1));
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1));
-        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res2) == 112, " found %lld\n",
+        LASSERTF((int)offsetof(struct ldlm_reply, lock_policy_res2) == 104, " found %lld\n",
                  (long long)(int)offsetof(struct ldlm_reply, lock_policy_res2));
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2));
@@ -1120,6 +1328,8 @@ void lustre_assert_wire_constants(void)
                  (long long)OST_RAID1_REC);
         LASSERTF(MDS_UNLINK_REC == 274801668, " found %lld\n",
                  (long long)MDS_UNLINK_REC);
+        LASSERTF(MDS_SETATTR_REC == 274801665, " found %lld\n",
+                 (long long)MDS_SETATTR_REC);
         LASSERTF(OBD_CFG_REC == 274857984, " found %lld\n",
                  (long long)OBD_CFG_REC);
         LASSERTF(PTL_CFG_REC == 274923520, " found %lld\n",
@@ -1184,7 +1394,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_logid_rec *)0)->lid_tail));
 
         /* Checks for struct llog_create_rec */
-        LASSERTF((int)sizeof(struct llog_create_rec) == 64, " found %lld\n",
+        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));
@@ -1192,13 +1402,13 @@ void lustre_assert_wire_constants(void)
                  (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) == 24, " found %lld\n",
+        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) == 40, " found %lld\n",
+        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_ogen) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_create_rec, lcr_ogen) == 40, " found %lld\n",
                  (long long)(int)offsetof(struct llog_create_rec, lcr_ogen));
         LASSERTF((int)sizeof(((struct llog_create_rec *)0)->lcr_ogen) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_create_rec *)0)->lcr_ogen));
@@ -1244,7 +1454,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_unlink_rec *)0)->lur_tail));
 
         /* Checks for struct llog_size_change_rec */
-        LASSERTF((int)sizeof(struct llog_size_change_rec) == 56, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_size_change_rec) == 48, " 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));
@@ -1252,13 +1462,13 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_hdr));
         LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_fid) == 16, " found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_fid));
-        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid) == 24, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid) == 16, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_fid));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_io_epoch) == 40, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_io_epoch) == 32, " found %lld\n",
                  (long long)(int)offsetof(struct llog_size_change_rec, lsc_io_epoch));
         LASSERTF((int)sizeof(((struct llog_size_change_rec *)0)->lsc_io_epoch) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_size_change_rec *)0)->lsc_io_epoch));
-        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 48, " found %lld\n",
+        LASSERTF((int)offsetof(struct llog_size_change_rec, lsc_tail) == 40, " 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));
@@ -1326,6 +1536,10 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llog_log_hdr, llh_tgtuuid));
         LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid) == 40, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_tgtuuid));
+        LASSERTF((int)offsetof(struct llog_log_hdr, llh_reserved) == 84, " found %lld\n",
+                 (long long)(int)offsetof(struct llog_log_hdr, llh_reserved));
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_reserved) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_reserved));
         LASSERTF((int)offsetof(struct llog_log_hdr, llh_bitmap) == 88, " found %lld\n",
                  (long long)(int)offsetof(struct llog_log_hdr, llh_bitmap));
         LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap) == 8096, " found %lld\n",
@@ -1382,8 +1596,8 @@ 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));
-        LASSERTF(LLOG_ORIGIN_HANDLE_OPEN == 501, " found %lld\n",
-                 (long long)LLOG_ORIGIN_HANDLE_OPEN);
+        LASSERTF(LLOG_ORIGIN_HANDLE_CREATE == 501, " found %lld\n",
+                 (long long)LLOG_ORIGIN_HANDLE_CREATE);
         LASSERTF(LLOG_ORIGIN_HANDLE_NEXT_BLOCK == 502, " found %lld\n",
                  (long long)LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
         LASSERTF(LLOG_ORIGIN_HANDLE_READ_HEADER == 503, " found %lld\n",
@@ -1412,5 +1626,25 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct llogd_conn_body, lgdc_ctxt_idx));
         LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
+
+        /* Checks for struct qunit_data */
+        LASSERTF((int)sizeof(struct qunit_data) == 16, " 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_type) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data, qd_type));
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_type) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_type));
+        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) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_count));
+        LASSERTF((int)offsetof(struct qunit_data, qd_isblk) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data, qd_isblk));
+        LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_isblk) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data *)0)->qd_isblk));
 }