LU-7543 obd: reserve connection flag OBD_CONNECT_SUBTREE

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

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 2e997c7..2ffccf1 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -355,7 +355,10 @@ check_ptlrpc_body(void)
        CHECK_MEMBER(ptlrpc_body, pb_slv);
        CHECK_CVALUE(PTLRPC_NUM_VERSIONS);
        CHECK_MEMBER(ptlrpc_body, pb_pre_versions);
-       CHECK_MEMBER(ptlrpc_body, pb_padding);
+       CHECK_MEMBER(ptlrpc_body, pb_mbits);
+       CHECK_MEMBER(ptlrpc_body, pb_padding64_0);
+       CHECK_MEMBER(ptlrpc_body, pb_padding64_1);
+       CHECK_MEMBER(ptlrpc_body, pb_padding64_2);
        CHECK_CVALUE(LUSTRE_JOBID_SIZE);
        CHECK_MEMBER(ptlrpc_body, pb_jobid);
 
@@ -378,7 +381,10 @@ check_ptlrpc_body(void)
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_limit);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_slv);
        CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_pre_versions);
-       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_mbits);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding64_0);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding64_1);
+       CHECK_MEMBER_SAME(ptlrpc_body_v3, ptlrpc_body_v2, pb_padding64_2);
 
        CHECK_VALUE(MSG_PTLRPC_BODY_OFF);
        CHECK_VALUE(REQ_REC_OFF);
@@ -521,6 +527,8 @@ check_obd_connect_data(void)
        CHECK_DEFINE_64X(OBD_CONNECT_UNLINK_CLOSE);
        CHECK_DEFINE_64X(OBD_CONNECT_MULTIMODRPCS);
        CHECK_DEFINE_64X(OBD_CONNECT_DIR_STRIPE);
+       CHECK_DEFINE_64X(OBD_CONNECT_SUBTREE);
+       CHECK_DEFINE_64X(OBD_CONNECT_BULK_MBITS);
 
        CHECK_VALUE_X(OBD_CKSUM_CRC32);
        CHECK_VALUE_X(OBD_CKSUM_ADLER);
@@ -953,8 +961,13 @@ check_mdt_body(void)
        CHECK_DEFINE_X(LUSTRE_SYNC_FL);
        CHECK_DEFINE_X(LUSTRE_IMMUTABLE_FL);
        CHECK_DEFINE_X(LUSTRE_APPEND_FL);
+       CHECK_DEFINE_X(LUSTRE_NODUMP_FL);
        CHECK_DEFINE_X(LUSTRE_NOATIME_FL);
+       CHECK_DEFINE_X(LUSTRE_INDEX_FL);
        CHECK_DEFINE_X(LUSTRE_DIRSYNC_FL);
+       CHECK_DEFINE_X(LUSTRE_TOPDIR_FL);
+       CHECK_DEFINE_X(LUSTRE_DIRECTIO_FL);
+       CHECK_DEFINE_X(LUSTRE_INLINE_DATA_FL);
 
        CHECK_DEFINE_X(MDS_INODELOCK_LOOKUP);
        CHECK_DEFINE_X(MDS_INODELOCK_UPDATE);
@@ -1289,6 +1302,20 @@ check_ldlm_intent(void)
        BLANK_LINE();
        CHECK_STRUCT(ldlm_intent);
        CHECK_MEMBER(ldlm_intent, opc);
+       CHECK_VALUE(IT_OPEN);
+       CHECK_VALUE(IT_CREAT);
+       CHECK_VALUE(IT_READDIR);
+       CHECK_VALUE(IT_GETATTR);
+       CHECK_VALUE(IT_LOOKUP);
+       CHECK_VALUE(IT_UNLINK);
+       CHECK_VALUE(IT_TRUNC);
+       CHECK_VALUE(IT_GETXATTR);
+       CHECK_VALUE(IT_EXEC);
+       CHECK_VALUE(IT_PIN);
+       CHECK_VALUE(IT_LAYOUT);
+       CHECK_VALUE(IT_QUOTA_DQACQ);
+       CHECK_VALUE(IT_QUOTA_CONN);
+       CHECK_VALUE(IT_SETXATTR);
 }
 
 static void
@@ -1297,7 +1324,7 @@ check_ldlm_resource_desc(void)
        BLANK_LINE();
        CHECK_STRUCT(ldlm_resource_desc);
        CHECK_MEMBER(ldlm_resource_desc, lr_type);
-       CHECK_MEMBER(ldlm_resource_desc, lr_padding);
+       CHECK_MEMBER(ldlm_resource_desc, lr_pad);
        CHECK_MEMBER(ldlm_resource_desc, lr_name);
 }
 
@@ -1629,9 +1656,6 @@ check_llog_log_hdr(void)
        CHECK_MEMBER(llog_log_hdr, llh_flags);
        CHECK_MEMBER(llog_log_hdr, llh_cat_idx);
        CHECK_MEMBER(llog_log_hdr, llh_tgtuuid);
-       CHECK_MEMBER(llog_log_hdr, llh_reserved);
-       CHECK_MEMBER(llog_log_hdr, llh_bitmap);
-       CHECK_MEMBER(llog_log_hdr, llh_tail);
 }
 
 static void
@@ -2069,7 +2093,7 @@ static void check_object_update(void)
        CHECK_STRUCT(object_update);
        CHECK_MEMBER(object_update, ou_type);
        CHECK_MEMBER(object_update, ou_params_count);
-       CHECK_MEMBER(object_update, ou_master_index);
+       CHECK_MEMBER(object_update, ou_result_size);
        CHECK_MEMBER(object_update, ou_flags);
        CHECK_MEMBER(object_update, ou_padding1);
        CHECK_MEMBER(object_update, ou_batchid);
@@ -2107,6 +2131,25 @@ static void check_object_update_reply(void)
        CHECK_MEMBER(object_update_reply, ourp_lens);
 }
 
+static void check_out_update_header(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(out_update_header);
+       CHECK_MEMBER(out_update_header, ouh_magic);
+       CHECK_MEMBER(out_update_header, ouh_count);
+       CHECK_MEMBER(out_update_header, ouh_inline_length);
+       CHECK_MEMBER(out_update_header, ouh_reply_size);
+       CHECK_MEMBER(out_update_header, ouh_inline_data);
+}
+
+static void check_out_update_buffer(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(out_update_buffer);
+       CHECK_MEMBER(out_update_buffer, oub_size);
+       CHECK_MEMBER(out_update_buffer, oub_padding);
+}
+
 static void check_lfsck_request(void)
 {
        BLANK_LINE();
@@ -2163,6 +2206,52 @@ static void check_lfsck_reply(void)
        CHECK_MEMBER(lfsck_reply, lr_padding_2);
 }
 
+static void check_update_params(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(update_params);
+       CHECK_MEMBER(update_params, up_params);
+}
+
+static void check_update_op(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(update_op);
+       CHECK_MEMBER(update_op, uop_fid);
+       CHECK_MEMBER(update_op, uop_type);
+       CHECK_MEMBER(update_op, uop_param_count);
+       CHECK_MEMBER(update_op, uop_params_off);
+}
+
+static void check_update_ops(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(update_ops);
+       CHECK_MEMBER(update_ops, uops_op);
+}
+
+static void check_update_records(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(update_records);
+       CHECK_MEMBER(update_records, ur_master_transno);
+       CHECK_MEMBER(update_records, ur_batchid);
+       CHECK_MEMBER(update_records, ur_flags);
+       CHECK_MEMBER(update_records, ur_index);
+       CHECK_MEMBER(update_records, ur_update_count);
+       CHECK_MEMBER(update_records, ur_param_count);
+
+       CHECK_VALUE_X(UPDATE_RECORD_CONTINUE);
+}
+
+static void check_llog_update_record(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(llog_update_record);
+       CHECK_MEMBER(llog_update_record, lur_hdr);
+       CHECK_MEMBER(llog_update_record, lur_update_rec);
+}
+
 static void system_string(char *cmdline, char *str, int len)
 {
        int   fds[2];
@@ -2329,8 +2418,6 @@ main(int argc, char **argv)
        CHECK_VALUE(MDS_STATUS_CONN);
        CHECK_VALUE(MDS_STATUS_LOV);
 
-       CHECK_VALUE(LUSTRE_BFLAG_UNCOMMITTED_WRITES);
-
        CHECK_VALUE_64X(MDS_ATTR_MODE);
        CHECK_VALUE_64X(MDS_ATTR_UID);
        CHECK_VALUE_64X(MDS_ATTR_GID);
@@ -2554,10 +2641,18 @@ main(int argc, char **argv)
        check_object_update_request();
        check_object_update_result();
        check_object_update_reply();
+       check_out_update_header();
+       check_out_update_buffer();
 
        check_lfsck_request();
        check_lfsck_reply();
 
+       check_update_params();
+       check_update_op();
+       check_update_ops();
+       check_update_records();
+       check_llog_update_record();
+
        printf("}\n\n");
 
        return 0;