X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=2ffccf127ceb6fa3feb958f887cacc5ef9011e5e;hb=2b16de10d79f930283a1a0dc6e8c9c2a779aae5d;hp=3b749c4c6652a11cd6d6a1a43e1e403962c106bf;hpb=8f1c8dbe2389e1ef1e1d3387e343fb9a1bb84198;p=fs%2Flustre-release.git diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 3b749c4..2ffccf1 100644 --- 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/ @@ -35,9 +35,9 @@ */ #include +#include #include #include -#include #include #include #include @@ -209,25 +209,11 @@ check_lustre_mdt_attrs(void) CHECK_VALUE_X(LMAI_RELEASED); CHECK_VALUE_X(LMAC_HSM); - CHECK_VALUE_X(LMAC_SOM); CHECK_VALUE_X(LMAC_NOT_IN_OI); CHECK_VALUE_X(LMAC_FID_ON_OST); } static void -check_som_attrs(void) -{ - BLANK_LINE(); - CHECK_STRUCT(som_attrs); - CHECK_MEMBER(som_attrs, som_compat); - CHECK_MEMBER(som_attrs, som_incompat); - CHECK_MEMBER(som_attrs, som_ioepoch); - CHECK_MEMBER(som_attrs, som_size); - CHECK_MEMBER(som_attrs, som_blocks); - CHECK_MEMBER(som_attrs, som_mountid); -} - -static void check_hsm_attrs(void) { BLANK_LINE(); @@ -250,8 +236,8 @@ check_ost_id(void) CHECK_VALUE(FID_SEQ_OST_MDT0); CHECK_VALUE(FID_SEQ_LLOG); CHECK_VALUE(FID_SEQ_ECHO); - CHECK_VALUE(FID_SEQ_OST_MDT1); - CHECK_VALUE(FID_SEQ_OST_MAX); + CHECK_VALUE(FID_SEQ_UNUSED_START); + CHECK_VALUE(FID_SEQ_UNUSED_END); CHECK_VALUE(FID_SEQ_RSVD); CHECK_VALUE(FID_SEQ_IGIF); CHECK_VALUE_64X(FID_SEQ_IGIF_MAX); @@ -264,6 +250,9 @@ check_ost_id(void) CHECK_VALUE_64X(FID_SEQ_QUOTA); CHECK_VALUE_64X(FID_SEQ_QUOTA_GLB); CHECK_VALUE_64X(FID_SEQ_ROOT); + CHECK_VALUE_64X(FID_SEQ_LAYOUT_RBTREE); + CHECK_VALUE_64X(FID_SEQ_UPDATE_LOG); + CHECK_VALUE_64X(FID_SEQ_UPDATE_LOG_DIR); CHECK_VALUE_64X(FID_SEQ_NORMAL); CHECK_VALUE_64X(FID_SEQ_LOV_DEFAULT); @@ -366,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); @@ -389,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); @@ -532,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); @@ -592,7 +589,6 @@ check_obdo(void) CHECK_DEFINE_64X(OBD_MD_FLHANDLE); CHECK_DEFINE_64X(OBD_MD_FLCKSUM); CHECK_DEFINE_64X(OBD_MD_FLQOS); - CHECK_DEFINE_64X(OBD_MD_FLCOOKIE); CHECK_DEFINE_64X(OBD_MD_FLGROUP); CHECK_DEFINE_64X(OBD_MD_FLFID); CHECK_DEFINE_64X(OBD_MD_FLEPOCH); @@ -928,7 +924,7 @@ check_mdt_body(void) CHECK_MEMBER(mdt_body, mbo_eadatasize); CHECK_MEMBER(mdt_body, mbo_aclsize); CHECK_MEMBER(mdt_body, mbo_max_mdsize); - CHECK_MEMBER(mdt_body, mbo_max_cookiesize); + CHECK_MEMBER(mdt_body, mbo_unused3); CHECK_MEMBER(mdt_body, mbo_uid_h); CHECK_MEMBER(mdt_body, mbo_gid_h); CHECK_MEMBER(mdt_body, mbo_padding_5); @@ -940,9 +936,6 @@ check_mdt_body(void) CHECK_VALUE_O(MDS_FMODE_CLOSED); CHECK_VALUE_O(MDS_FMODE_EXEC); - CHECK_VALUE_O(MDS_FMODE_EPOCH); - CHECK_VALUE_O(MDS_FMODE_TRUNC); - CHECK_VALUE_O(MDS_FMODE_SOM); CHECK_VALUE_O(MDS_OPEN_CREATED); CHECK_VALUE_O(MDS_OPEN_CROSS); @@ -968,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); @@ -982,10 +980,10 @@ check_mdt_ioepoch(void) { BLANK_LINE(); CHECK_STRUCT(mdt_ioepoch); - CHECK_MEMBER(mdt_ioepoch, handle); - CHECK_MEMBER(mdt_ioepoch, ioepoch); - CHECK_MEMBER(mdt_ioepoch, flags); - CHECK_MEMBER(mdt_ioepoch, padding); + CHECK_MEMBER(mdt_ioepoch, mio_handle); + CHECK_MEMBER(mdt_ioepoch, mio_unused1); + CHECK_MEMBER(mdt_ioepoch, mio_unused2); + CHECK_MEMBER(mdt_ioepoch, mio_padding); } static void @@ -1304,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 @@ -1312,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); } @@ -1644,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 @@ -1697,6 +1706,8 @@ check_llogd_body(void) CHECK_CVALUE(LLOG_CHANGELOG_REPL_CTXT); CHECK_CVALUE(LLOG_CHANGELOG_USER_ORIG_CTXT); CHECK_CVALUE(LLOG_AGENT_ORIG_CTXT); + CHECK_CVALUE(LLOG_UPDATELOG_ORIG_CTXT); + CHECK_CVALUE(LLOG_UPDATELOG_REPL_CTXT); CHECK_CVALUE(LLOG_MAX_CTXTS); } @@ -1715,9 +1726,9 @@ check_ll_fiemap_info_key(void) { BLANK_LINE(); CHECK_STRUCT(ll_fiemap_info_key); - CHECK_MEMBER(ll_fiemap_info_key, name[8]); - CHECK_MEMBER(ll_fiemap_info_key, oa); - CHECK_MEMBER(ll_fiemap_info_key, fiemap); + CHECK_MEMBER(ll_fiemap_info_key, lfik_name[8]); + CHECK_MEMBER(ll_fiemap_info_key, lfik_oa); + CHECK_MEMBER(ll_fiemap_info_key, lfik_fiemap); } static void @@ -1839,14 +1850,14 @@ static void check_ll_user_fiemap(void) { BLANK_LINE(); - CHECK_STRUCT(ll_user_fiemap); - CHECK_MEMBER(ll_user_fiemap, fm_start); - CHECK_MEMBER(ll_user_fiemap, fm_length); - CHECK_MEMBER(ll_user_fiemap, fm_flags); - CHECK_MEMBER(ll_user_fiemap, fm_mapped_extents); - CHECK_MEMBER(ll_user_fiemap, fm_extent_count); - CHECK_MEMBER(ll_user_fiemap, fm_reserved); - CHECK_MEMBER(ll_user_fiemap, fm_extents); + CHECK_STRUCT(fiemap); + CHECK_MEMBER(fiemap, fm_start); + CHECK_MEMBER(fiemap, fm_length); + CHECK_MEMBER(fiemap, fm_flags); + CHECK_MEMBER(fiemap, fm_mapped_extents); + CHECK_MEMBER(fiemap, fm_extent_count); + CHECK_MEMBER(fiemap, fm_reserved); + CHECK_MEMBER(fiemap, fm_extents); CHECK_CDEFINE(FIEMAP_FLAG_SYNC); CHECK_CDEFINE(FIEMAP_FLAG_XATTR); @@ -1857,12 +1868,12 @@ static void check_ll_fiemap_extent(void) { BLANK_LINE(); - CHECK_STRUCT(ll_fiemap_extent); - CHECK_MEMBER(ll_fiemap_extent, fe_logical); - CHECK_MEMBER(ll_fiemap_extent, fe_physical); - CHECK_MEMBER(ll_fiemap_extent, fe_length); - CHECK_MEMBER(ll_fiemap_extent, fe_flags); - CHECK_MEMBER(ll_fiemap_extent, fe_device); + CHECK_STRUCT(fiemap_extent); + CHECK_MEMBER(fiemap_extent, fe_logical); + CHECK_MEMBER(fiemap_extent, fe_physical); + CHECK_MEMBER(fiemap_extent, fe_length); + CHECK_MEMBER(fiemap_extent, fe_flags); + CHECK_MEMBER(fiemap_extent, fe_device); CHECK_CDEFINE(FIEMAP_EXTENT_LAST); CHECK_CDEFINE(FIEMAP_EXTENT_UNKNOWN); @@ -2082,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); @@ -2120,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(); @@ -2176,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]; @@ -2342,18 +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_X(MF_SOM_CHANGE); - CHECK_VALUE_X(MF_EPOCH_OPEN); - CHECK_VALUE_X(MF_EPOCH_CLOSE); - CHECK_VALUE_X(MF_MDC_CANCEL_FID1); - CHECK_VALUE_X(MF_MDC_CANCEL_FID2); - CHECK_VALUE_X(MF_MDC_CANCEL_FID3); - CHECK_VALUE_X(MF_MDC_CANCEL_FID4); - CHECK_VALUE_X(MF_SOM_AU); - CHECK_VALUE_X(MF_GETATTR_LOCK); - CHECK_VALUE_64X(MDS_ATTR_MODE); CHECK_VALUE_64X(MDS_ATTR_UID); CHECK_VALUE_64X(MDS_ATTR_GID); @@ -2472,8 +2536,11 @@ main(int argc, char **argv) CHECK_VALUE(OUT_INDEX_LOOKUP); CHECK_VALUE(OUT_INDEX_INSERT); CHECK_VALUE(OUT_INDEX_DELETE); + CHECK_VALUE(OUT_WRITE); + CHECK_VALUE(OUT_XATTR_DEL); + CHECK_VALUE(OUT_PUNCH); + CHECK_VALUE(OUT_READ); - check_som_attrs(); check_hsm_attrs(); check_ost_id(); check_lu_dirent(); @@ -2574,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;