b=19016

[fs/lustre-release.git] / lustre / utils / wirecheck.c

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index e75cf6c..3c8dfaa 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -171,6 +171,8 @@ check_ptlrpc_body(void)
         CHECK_MEMBER(ptlrpc_body, pb_service_time);
         CHECK_MEMBER(ptlrpc_body, pb_slv);
         CHECK_MEMBER(ptlrpc_body, pb_limit);
+        CHECK_CVALUE(PTLRPC_NUM_VERSIONS);
+        CHECK_MEMBER(ptlrpc_body, pb_pre_versions[PTLRPC_NUM_VERSIONS]);
 }
 
 static void check_obd_connect_data(void)
@@ -206,8 +208,8 @@ static void check_obd_connect_data(void)
         CHECK_CDEFINE(OBD_CONNECT_JOIN);
         CHECK_CDEFINE(OBD_CONNECT_ATTRFID);
         CHECK_CDEFINE(OBD_CONNECT_NODEVOH);
-        CHECK_CDEFINE(OBD_CONNECT_LCL_CLIENT);
         CHECK_CDEFINE(OBD_CONNECT_RMT_CLIENT);
+        CHECK_CDEFINE(OBD_CONNECT_RMT_CLIENT_FORCE);
         CHECK_CDEFINE(OBD_CONNECT_BRW_SIZE);
         CHECK_CDEFINE(OBD_CONNECT_QUOTA64);
         CHECK_CDEFINE(OBD_CONNECT_MDS_CAPA);
@@ -217,6 +219,8 @@ static void check_obd_connect_data(void)
         CHECK_CDEFINE(OBD_CONNECT_AT);
         CHECK_CDEFINE(OBD_CONNECT_CANCELSET);
         CHECK_CDEFINE(OBD_CONNECT_LRU_RESIZE);
+        CHECK_CDEFINE(OBD_CONNECT_VBR);
+        CHECK_CDEFINE(OBD_CONNECT_SKIP_ORPHAN);
 }
 
 static void
@@ -252,7 +256,7 @@ check_obdo(void)
         CHECK_MEMBER(obdo, o_padding_3);
         CHECK_MEMBER(obdo, o_padding_4);
         CHECK_MEMBER(obdo, o_padding_5);
-        CHECK_MEMBER(obdo, o_padding_6);       
+        CHECK_MEMBER(obdo, o_padding_6);
 
         CHECK_CDEFINE(OBD_MD_FLID);
         CHECK_CDEFINE(OBD_MD_FLATIME);
@@ -302,6 +306,7 @@ check_obdo(void)
         CHECK_CDEFINE(OBD_FL_TRUNCLOCK);
         CHECK_CDEFINE(OBD_FL_CKSUM_CRC32);
         CHECK_CDEFINE(OBD_FL_CKSUM_ADLER);
+        CHECK_CDEFINE(OBD_FL_SHRINK_GRANT);
         CHECK_CVALUE(OBD_CKSUM_CRC32);
         CHECK_CVALUE(OBD_CKSUM_ADLER);
 }
@@ -479,6 +484,15 @@ check_ll_fid(void)
 }
 
 static void
+check_lu_fid_pack(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(lu_fid_pack);
+        CHECK_MEMBER(lu_fid_pack, fp_len);
+        CHECK_MEMBER(lu_fid_pack, fp_area);
+}
+
+static void
 check_mds_status_req(void)
 {
         BLANK_LINE();
@@ -782,6 +796,19 @@ check_ldlm_lvb(void)
         CHECK_MEMBER(ost_lvb, lvb_blocks);
 }
 
+static void
+check_cfg_marker(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(cfg_marker);
+        CHECK_MEMBER(cfg_marker, cm_step);
+        CHECK_MEMBER(cfg_marker, cm_flags);
+        CHECK_MEMBER(cfg_marker, cm_vers);
+        CHECK_MEMBER(cfg_marker, cm_createtime);
+        CHECK_MEMBER(cfg_marker, cm_canceltime);
+        CHECK_MEMBER(cfg_marker, cm_tgtname);
+        CHECK_MEMBER(cfg_marker, cm_comment);
+}
 
 static void
 check_llog_logid(void)
@@ -901,6 +928,22 @@ check_llog_setattr_rec(void)
 }
 
 static void
+check_llog_setattr64_rec(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(llog_setattr64_rec);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_hdr);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_oid);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_ogen);
+        CHECK_MEMBER(llog_setattr64_rec, padding);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_uid);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_gid);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_gid_h);
+        CHECK_MEMBER(llog_setattr64_rec, lsr_tail);
+}
+
+static void
 check_llog_size_change_rec(void)
 {
         BLANK_LINE();
@@ -913,6 +956,23 @@ check_llog_size_change_rec(void)
 }
 
 static void
+check_llog_changelog_rec(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(llog_changelog_rec);
+        CHECK_MEMBER(llog_changelog_rec, cr_hdr);
+        CHECK_MEMBER(llog_changelog_rec, cr_flags);
+        CHECK_MEMBER(llog_changelog_rec, cr_namelen);
+        CHECK_MEMBER(llog_changelog_rec, cr_type);
+        CHECK_MEMBER(llog_changelog_rec, cr_index);
+        CHECK_MEMBER(llog_changelog_rec, cr_prev);
+        CHECK_MEMBER(llog_changelog_rec, cr_time);
+        CHECK_MEMBER(llog_changelog_rec, cr_tfid);
+        CHECK_MEMBER(llog_changelog_rec, cr_pfid);
+        CHECK_MEMBER(llog_changelog_rec, cr_tail);
+}
+
+static void
 check_llog_gen(void)
 {
         BLANK_LINE();
@@ -1022,17 +1082,8 @@ check_qunit_data(void)
         CHECK_MEMBER(qunit_data, qd_id);
         CHECK_MEMBER(qunit_data, qd_flags);
         CHECK_MEMBER(qunit_data, qd_count);
-}
-
-static void
-check_qunit_data_old(void)
-{
-        BLANK_LINE();
-        CHECK_STRUCT(qunit_data_old);
-        CHECK_MEMBER(qunit_data_old, qd_id);
-        CHECK_MEMBER(qunit_data_old, qd_type);
-        CHECK_MEMBER(qunit_data_old, qd_count);
-        CHECK_MEMBER(qunit_data_old, qd_isblk);
+        CHECK_MEMBER(qunit_data, qd_qunit);
+        CHECK_MEMBER(qunit_data, padding);
 }
 
 static void
@@ -1093,6 +1144,18 @@ check_posix_acl_xattr_header(void)
 }
 
 static void
+check_quota_adjust_qunit(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(quota_adjust_qunit);
+        CHECK_MEMBER(quota_adjust_qunit, qaq_flags);
+        CHECK_MEMBER(quota_adjust_qunit, qaq_id);
+        CHECK_MEMBER(quota_adjust_qunit, qaq_bunit_sz);
+        CHECK_MEMBER(quota_adjust_qunit, qaq_iunit_sz);
+        CHECK_MEMBER(quota_adjust_qunit, padding1);
+}
+
+static void
 check_ll_user_fiemap(void)
 {
         BLANK_LINE();
@@ -1124,19 +1187,41 @@ check_ll_fiemap_extent(void)
         CHECK_CDEFINE(FIEMAP_EXTENT_LAST);
         CHECK_CDEFINE(FIEMAP_EXTENT_UNKNOWN);
         CHECK_CDEFINE(FIEMAP_EXTENT_DELALLOC);
-        CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT);
-        CHECK_CDEFINE(FIEMAP_EXTENT_SECONDARY);
-        CHECK_CDEFINE(FIEMAP_EXTENT_NET);
-        CHECK_CDEFINE(FIEMAP_EXTENT_DATA_COMPRESSED);
+        CHECK_CDEFINE(FIEMAP_EXTENT_ENCODED);
         CHECK_CDEFINE(FIEMAP_EXTENT_DATA_ENCRYPTED);
         CHECK_CDEFINE(FIEMAP_EXTENT_NOT_ALIGNED);
         CHECK_CDEFINE(FIEMAP_EXTENT_DATA_INLINE);
         CHECK_CDEFINE(FIEMAP_EXTENT_DATA_TAIL);
         CHECK_CDEFINE(FIEMAP_EXTENT_UNWRITTEN);
         CHECK_CDEFINE(FIEMAP_EXTENT_MERGED);
+        CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT);
+        CHECK_CDEFINE(FIEMAP_EXTENT_NET);
 }
 
 static void
+check_link_ea_header(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(link_ea_header);
+        CHECK_MEMBER(link_ea_header, leh_magic);
+        CHECK_MEMBER(link_ea_header, leh_reccount);
+        CHECK_MEMBER(link_ea_header, leh_len);
+        CHECK_MEMBER(link_ea_header, padding1);
+        CHECK_MEMBER(link_ea_header, padding2);
+}
+
+static void
+check_link_ea_entry(void)
+{
+        BLANK_LINE();
+        CHECK_STRUCT(link_ea_entry);
+        CHECK_MEMBER(link_ea_entry, lee_reclen);
+        CHECK_MEMBER(link_ea_entry, lee_parent_fid);
+        CHECK_MEMBER(link_ea_entry, lee_name);
+}
+
+
+static void
 system_string (char *cmdline, char *str, int len)
 {
         int   fds[2];
@@ -1240,6 +1325,7 @@ main(int argc, char **argv)
         CHECK_VALUE(OST_SYNC);
         CHECK_VALUE(OST_QUOTACHECK);
         CHECK_VALUE(OST_QUOTACTL);
+        CHECK_VALUE(OST_QUOTA_ADJUST_QUNIT);
         CHECK_VALUE(OST_LAST_OPC);
 
         CHECK_DEFINE(OBD_OBJECT_EOF);
@@ -1260,6 +1346,10 @@ main(int argc, char **argv)
         CHECK_VALUE(MDS_SET_INFO);
         CHECK_VALUE(MDS_QUOTACHECK);
         CHECK_VALUE(MDS_QUOTACTL);
+        CHECK_VALUE(MDS_GETXATTR);
+        CHECK_VALUE(MDS_SETXATTR);
+        CHECK_VALUE(MDS_WRITEPAGE);
+        CHECK_VALUE(MDS_IS_SUBDIR);
         CHECK_VALUE(MDS_LAST_OPC);
 
         CHECK_VALUE(REINT_SETATTR);
@@ -1320,7 +1410,7 @@ main(int argc, char **argv)
 
         CHECK_VALUE(MGS_CONNECT);
         CHECK_VALUE(MGS_DISCONNECT);
-        CHECK_VALUE(MGS_EXCEPTION);   
+        CHECK_VALUE(MGS_EXCEPTION);
         CHECK_VALUE(MGS_TARGET_REG);
         CHECK_VALUE(MGS_TARGET_DEL);
         CHECK_VALUE(MGS_SET_INFO);
@@ -1342,6 +1432,7 @@ main(int argc, char **argv)
         check_niobuf_remote();
         check_ost_body();
         check_ll_fid();
+        check_lu_fid_pack();
         check_mds_status_req();
         check_mds_body();
         check_mds_rec_setattr();
@@ -1361,6 +1452,7 @@ main(int argc, char **argv)
         check_ldlm_request();
         check_ldlm_reply();
         check_ldlm_lvb();
+        check_cfg_marker();
         check_llog_logid();
         check_llog_catid();
         check_llog_rec_hdr();
@@ -1370,7 +1462,9 @@ main(int argc, char **argv)
         check_llog_orphan_rec();
         check_llog_unlink_rec();
         check_llog_setattr_rec();
+        check_llog_setattr64_rec();
         check_llog_size_change_rec();
+        check_llog_changelog_rec();
         check_llog_gen();
         check_llog_gen_rec();
         check_llog_log_hdr();
@@ -1380,7 +1474,7 @@ main(int argc, char **argv)
         check_llog_array_rec();
         check_mds_extent_desc();
         check_qunit_data();
-        check_qunit_data_old();
+        check_quota_adjust_qunit();
         check_mgs_target_info();
         check_lustre_disk_data();
         check_ll_user_fiemap();
@@ -1392,7 +1486,8 @@ main(int argc, char **argv)
         check_posix_acl_xattr_entry();
         check_posix_acl_xattr_header();
         printf("#endif\n");
-
+        check_link_ea_header();
+        check_link_ea_entry();
 
         printf("}\n\n");