LU-6349 ptlrpc: remove LUSTRE_MSG_MAGIC_V1 support

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

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index a2efeac..3b749c4 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -337,9 +337,7 @@ check_lustre_msg_v2(void)
        CHECK_MEMBER(lustre_msg_v2, lm_padding_3);
        CHECK_MEMBER(lustre_msg_v2, lm_buflens[0]);
 
-       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1);
        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2);
-       CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V1_SWABBED);
        CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2_SWABBED);
 }
 
@@ -354,7 +352,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);
@@ -376,7 +376,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 +457,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 +530,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);
@@ -2132,9 +2137,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_stripe_count);
-       CHECK_MEMBER(lfsck_request, lr_hash_type);
-       CHECK_MEMBER(lfsck_request, lr_padding_3);
+       CHECK_MEMBER(lfsck_request, lr_padding_1);
+       CHECK_MEMBER(lfsck_request, lr_padding_2);
 
        CHECK_VALUE_X(LFSCK_TYPE_SCRUB);
        CHECK_VALUE_X(LFSCK_TYPE_LAYOUT);
@@ -2151,7 +2155,6 @@ 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);