LU-5319 ptlrpc: Add a tag field to ptlrpc messages

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

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 558bcb0..488b31c 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -354,7 +354,9 @@ check_ptlrpc_body(void)
        CHECK_MEMBER(ptlrpc_body, pb_opc);
        CHECK_MEMBER(ptlrpc_body, pb_status);
        CHECK_MEMBER(ptlrpc_body, pb_last_xid);
-       CHECK_MEMBER(ptlrpc_body, pb_last_seen);
+       CHECK_MEMBER(ptlrpc_body, pb_tag);
+       CHECK_MEMBER(ptlrpc_body, pb_padding0);
+       CHECK_MEMBER(ptlrpc_body, pb_padding1);
        CHECK_MEMBER(ptlrpc_body, pb_last_committed);
        CHECK_MEMBER(ptlrpc_body, pb_transno);
        CHECK_MEMBER(ptlrpc_body, pb_flags);
@@ -367,7 +369,7 @@ check_ptlrpc_body(void)
        CHECK_CVALUE(PTLRPC_NUM_VERSIONS);
        CHECK_MEMBER(ptlrpc_body, pb_pre_versions);
        CHECK_MEMBER(ptlrpc_body, pb_padding);
-       CHECK_CVALUE(JOBSTATS_JOBID_SIZE);
+       CHECK_CVALUE(LUSTRE_JOBID_SIZE);
        CHECK_MEMBER(ptlrpc_body, pb_jobid);
 
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_handle);
@@ -376,7 +378,9 @@ check_ptlrpc_body(void)
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_opc);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_status);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_last_xid);
-       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_last_seen);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_tag);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding0);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding1);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_last_committed);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_transno);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_flags);
@@ -455,6 +459,8 @@ check_obd_connect_data(void)
        CHECK_MEMBER(obd_connect_data, ocd_max_easize);
        CHECK_MEMBER(obd_connect_data, ocd_instance);
        CHECK_MEMBER(obd_connect_data, ocd_maxbytes);
+       CHECK_MEMBER(obd_connect_data, ocd_maxmodrpcs);
+       CHECK_MEMBER(obd_connect_data, padding0);
        CHECK_MEMBER(obd_connect_data, padding1);
        CHECK_MEMBER(obd_connect_data, padding2);
        CHECK_MEMBER(obd_connect_data, padding3);
@@ -526,6 +532,7 @@ check_obd_connect_data(void)
        CHECK_DEFINE_64X(OBD_CONNECT_OPEN_BY_FID);
        CHECK_DEFINE_64X(OBD_CONNECT_LFSCK);
        CHECK_DEFINE_64X(OBD_CONNECT_UNLINK_CLOSE);
+       CHECK_DEFINE_64X(OBD_CONNECT_MULTIMODRPCS);
        CHECK_DEFINE_64X(OBD_CONNECT_DIR_STRIPE);
 
        CHECK_VALUE_X(OBD_CKSUM_CRC32);
@@ -711,6 +718,8 @@ check_lmv_mds_md_v1(void)
        CHECK_CDEFINE(LMV_HASH_TYPE_MASK);
        CHECK_CDEFINE(LMV_HASH_FLAG_MIGRATION);
        CHECK_CDEFINE(LMV_HASH_FLAG_DEAD);
+       CHECK_CDEFINE(LMV_HASH_FLAG_BAD_TYPE);
+       CHECK_CDEFINE(LMV_HASH_FLAG_LOST_LMV);
 }
 
 static void
@@ -1558,20 +1567,20 @@ check_changelog_rec(void)
 }
 
 static void
-check_changelog_rec_ext(void)
+check_changelog_ext_rename(void)
 {
        BLANK_LINE();
-       CHECK_STRUCT(changelog_ext_rec);
-       CHECK_MEMBER(changelog_ext_rec, cr_namelen);
-       CHECK_MEMBER(changelog_ext_rec, cr_flags);
-       CHECK_MEMBER(changelog_ext_rec, cr_type);
-       CHECK_MEMBER(changelog_ext_rec, cr_index);
-       CHECK_MEMBER(changelog_ext_rec, cr_prev);
-       CHECK_MEMBER(changelog_ext_rec, cr_time);
-       CHECK_MEMBER(changelog_ext_rec, cr_tfid);
-       CHECK_MEMBER(changelog_ext_rec, cr_pfid);
-       CHECK_MEMBER(changelog_ext_rec, cr_sfid);
-       CHECK_MEMBER(changelog_ext_rec, cr_spfid);
+       CHECK_STRUCT(changelog_ext_rename);
+       CHECK_MEMBER(changelog_ext_rename, cr_sfid);
+       CHECK_MEMBER(changelog_ext_rename, cr_spfid);
+}
+
+static void
+check_changelog_ext_jobid(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(changelog_ext_jobid);
+       CHECK_MEMBER(changelog_ext_jobid, cr_jobid);
 }
 
 static void
@@ -1590,7 +1599,7 @@ check_llog_changelog_rec(void)
        CHECK_STRUCT(llog_changelog_rec);
        CHECK_MEMBER(llog_changelog_rec, cr_hdr);
        CHECK_MEMBER(llog_changelog_rec, cr);
-       CHECK_MEMBER(llog_changelog_rec, cr_tail);
+       CHECK_MEMBER(llog_changelog_rec, cr_do_not_use);
 }
 
 static void
@@ -2130,8 +2139,8 @@ static void check_lfsck_request(void)
        CHECK_MEMBER(lfsck_request, lr_fid);
        CHECK_MEMBER(lfsck_request, lr_fid2);
        CHECK_MEMBER(lfsck_request, lr_fid3);
+       CHECK_MEMBER(lfsck_request, lr_padding_1);
        CHECK_MEMBER(lfsck_request, lr_padding_2);
-       CHECK_MEMBER(lfsck_request, lr_padding_3);
 
        CHECK_VALUE_X(LFSCK_TYPE_SCRUB);
        CHECK_VALUE_X(LFSCK_TYPE_LAYOUT);
@@ -2148,10 +2157,16 @@ static void check_lfsck_request(void)
        CHECK_VALUE(LE_PEER_EXIT);
        CHECK_VALUE(LE_CONDITIONAL_DESTROY);
        CHECK_VALUE(LE_PAIRS_VERIFY);
-       CHECK_VALUE(LE_CREATE_ORPHAN);
+       CHECK_VALUE(LE_SKIP_NLINK_DECLARE);
+       CHECK_VALUE(LE_SKIP_NLINK);
+       CHECK_VALUE(LE_SET_LMV_MASTER);
+       CHECK_VALUE(LE_SET_LMV_SLAVE);
 
        CHECK_VALUE_X(LEF_TO_OST);
        CHECK_VALUE_X(LEF_FROM_OST);
+       CHECK_VALUE_X(LEF_SET_LMV_HASH);
+       CHECK_VALUE_X(LEF_SET_LMV_ALL);
+       CHECK_VALUE_X(LEF_RECHECK_NAME_HASH);
 }
 
 static void check_lfsck_reply(void)
@@ -2519,7 +2534,8 @@ main(int argc, char **argv)
        check_llog_setattr64_rec();
        check_llog_size_change_rec();
        check_changelog_rec();
-       check_changelog_rec_ext();
+       check_changelog_ext_rename();
+       check_changelog_ext_jobid();
        check_changelog_setinfo();
        check_llog_changelog_rec();
        check_llog_changelog_user_rec();