X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=5de1fbc700b324a32a11fc5372d31ab442533a64;hp=46b057182790053bfb5ca9b525fea8b7d11e79ac;hb=11eba11fe0457b735194e5924e7bb1882a5b31b8;hpb=39f63cf54c624d89439b5b473035c1afe35e10fa diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 46b0571..5de1fbc 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -23,7 +23,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2016, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -38,9 +38,10 @@ #include #include #include -#include -#include -#include +#include +#include +#include +#include #define BLANK_LINE() \ do { \ @@ -233,6 +234,18 @@ check_lustre_ost_attrs(void) CHECK_MEMBER(lustre_ost_attrs, loa_comp_end); } + +static void +check_som_attrs(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lustre_som_attrs); + CHECK_MEMBER(lustre_som_attrs, lsa_valid); + CHECK_MEMBER(lustre_som_attrs, lsa_reserved); + CHECK_MEMBER(lustre_som_attrs, lsa_size); + CHECK_MEMBER(lustre_som_attrs, lsa_blocks); +} + static void check_hsm_attrs(void) { @@ -379,8 +392,8 @@ 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_V2); - CHECK_DEFINE_X(LUSTRE_MSG_MAGIC_V2_SWABBED); + CHECK_VALUE_X(LUSTRE_MSG_MAGIC_V2); + CHECK_VALUE_X(LUSTRE_MSG_MAGIC_V2_SWABBED); } static void @@ -450,27 +463,20 @@ check_ptlrpc_body(void) CHECK_VALUE(DLM_REPLY_REC_OFF); CHECK_VALUE(MSG_PTLRPC_HEADER_OFF); - CHECK_DEFINE_X(PTLRPC_MSG_VERSION); - CHECK_DEFINE_X(LUSTRE_VERSION_MASK); - CHECK_DEFINE_X(LUSTRE_OBD_VERSION); - CHECK_DEFINE_X(LUSTRE_MDS_VERSION); - CHECK_DEFINE_X(LUSTRE_OST_VERSION); - CHECK_DEFINE_X(LUSTRE_DLM_VERSION); - CHECK_DEFINE_X(LUSTRE_LOG_VERSION); - CHECK_DEFINE_X(LUSTRE_MGS_VERSION); + CHECK_VALUE_X(PTLRPC_MSG_VERSION); + CHECK_VALUE_X(LUSTRE_VERSION_MASK); + CHECK_VALUE_X(LUSTRE_OBD_VERSION); + CHECK_VALUE_X(LUSTRE_MDS_VERSION); + CHECK_VALUE_X(LUSTRE_OST_VERSION); + CHECK_VALUE_X(LUSTRE_DLM_VERSION); + CHECK_VALUE_X(LUSTRE_LOG_VERSION); + CHECK_VALUE_X(LUSTRE_MGS_VERSION); CHECK_VALUE(MSGHDR_AT_SUPPORT); CHECK_VALUE(MSGHDR_CKSUM_INCOMPAT18); - CHECK_VALUE_X(MSG_OP_FLAG_MASK); - CHECK_VALUE(MSG_OP_FLAG_SHIFT); - CHECK_VALUE_X(MSG_GEN_FLAG_MASK); - - CHECK_VALUE_X(MSG_LAST_REPLAY); CHECK_VALUE_X(MSG_RESENT); CHECK_VALUE_X(MSG_REPLAY); - CHECK_VALUE_X(MSG_DELAY_REPLAY); - CHECK_VALUE_X(MSG_VERSION_REPLAY); CHECK_VALUE_X(MSG_REQ_REPLAY_DONE); CHECK_VALUE_X(MSG_LOCK_REPLAY_DONE); @@ -479,7 +485,6 @@ check_ptlrpc_body(void) CHECK_VALUE_X(MSG_CONNECT_REPLAYABLE); CHECK_VALUE_X(MSG_CONNECT_LIBCLIENT); CHECK_VALUE_X(MSG_CONNECT_INITIAL); - CHECK_VALUE_X(MSG_CONNECT_ASYNC); CHECK_VALUE_X(MSG_CONNECT_NEXT_VER); CHECK_VALUE_X(MSG_CONNECT_TRANSNO); } @@ -540,7 +545,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_REQPORTAL); CHECK_DEFINE_64X(OBD_CONNECT_ACL); CHECK_DEFINE_64X(OBD_CONNECT_XATTR); - CHECK_DEFINE_64X(OBD_CONNECT_CROW); + CHECK_DEFINE_64X(OBD_CONNECT_LARGE_ACL); CHECK_DEFINE_64X(OBD_CONNECT_TRUNCLOCK); CHECK_DEFINE_64X(OBD_CONNECT_TRANSNO); CHECK_DEFINE_64X(OBD_CONNECT_IBITS); @@ -589,15 +594,33 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_MULTIMODRPCS); CHECK_DEFINE_64X(OBD_CONNECT_DIR_STRIPE); CHECK_DEFINE_64X(OBD_CONNECT_SUBTREE); - CHECK_DEFINE_64X(OBD_CONNECT_LOCK_AHEAD); + CHECK_DEFINE_64X(OBD_CONNECT_LOCKAHEAD_OLD); CHECK_DEFINE_64X(OBD_CONNECT_BULK_MBITS); CHECK_DEFINE_64X(OBD_CONNECT_OBDOPACK); CHECK_DEFINE_64X(OBD_CONNECT_FLAGS2); CHECK_DEFINE_64X(OBD_CONNECT2_FILE_SECCTX); + CHECK_DEFINE_64X(OBD_CONNECT2_LOCKAHEAD); + CHECK_DEFINE_64X(OBD_CONNECT2_DIR_MIGRATE); + CHECK_DEFINE_64X(OBD_CONNECT2_SUM_STATFS); + CHECK_DEFINE_64X(OBD_CONNECT2_OVERSTRIPING); + CHECK_DEFINE_64X(OBD_CONNECT2_FLR); + CHECK_DEFINE_64X(OBD_CONNECT2_WBC_INTENTS); + CHECK_DEFINE_64X(OBD_CONNECT2_LOCK_CONVERT); + CHECK_DEFINE_64X(OBD_CONNECT2_ARCHIVE_ID_ARRAY); + CHECK_DEFINE_64X(OBD_CONNECT2_SELINUX_POLICY); + CHECK_DEFINE_64X(OBD_CONNECT2_LSOM); + CHECK_DEFINE_64X(OBD_CONNECT2_PCC); + CHECK_DEFINE_64X(OBD_CONNECT2_ASYNC_DISCARD); CHECK_VALUE_X(OBD_CKSUM_CRC32); CHECK_VALUE_X(OBD_CKSUM_ADLER); CHECK_VALUE_X(OBD_CKSUM_CRC32C); + CHECK_VALUE_X(OBD_CKSUM_RESERVED); + CHECK_VALUE_X(OBD_CKSUM_T10IP512); + CHECK_VALUE_X(OBD_CKSUM_T10IP4K); + CHECK_VALUE_X(OBD_CKSUM_T10CRC512); + CHECK_VALUE_X(OBD_CKSUM_T10CRC4K); + CHECK_VALUE_X(OBD_CKSUM_T10_TOP); } static void @@ -639,7 +662,7 @@ check_obdo(void) CHECK_MEMBER(obdo, o_parent_ver); CHECK_MEMBER(obdo, o_handle); CHECK_MEMBER(obdo, o_layout); - CHECK_MEMBER(obdo, o_padding_3); + CHECK_MEMBER(obdo, o_layout_version); CHECK_MEMBER(obdo, o_uid_h); CHECK_MEMBER(obdo, o_gid_h); CHECK_MEMBER(obdo, o_data_version); @@ -661,32 +684,26 @@ check_obdo(void) CHECK_DEFINE_64X(OBD_MD_FLGID); CHECK_DEFINE_64X(OBD_MD_FLFLAGS); CHECK_DEFINE_64X(OBD_MD_FLNLINK); - CHECK_DEFINE_64X(OBD_MD_FLGENER); + CHECK_DEFINE_64X(OBD_MD_FLPARENT); CHECK_DEFINE_64X(OBD_MD_FLRDEV); CHECK_DEFINE_64X(OBD_MD_FLEASIZE); CHECK_DEFINE_64X(OBD_MD_LINKNAME); CHECK_DEFINE_64X(OBD_MD_FLHANDLE); CHECK_DEFINE_64X(OBD_MD_FLCKSUM); - CHECK_DEFINE_64X(OBD_MD_FLQOS); CHECK_DEFINE_64X(OBD_MD_FLGROUP); CHECK_DEFINE_64X(OBD_MD_FLFID); - CHECK_DEFINE_64X(OBD_MD_FLEPOCH); CHECK_DEFINE_64X(OBD_MD_FLGRANT); CHECK_DEFINE_64X(OBD_MD_FLDIREA); CHECK_DEFINE_64X(OBD_MD_FLUSRQUOTA); CHECK_DEFINE_64X(OBD_MD_FLGRPQUOTA); CHECK_DEFINE_64X(OBD_MD_FLMODEASIZE); CHECK_DEFINE_64X(OBD_MD_MDS); - CHECK_DEFINE_64X(OBD_MD_REINT); CHECK_DEFINE_64X(OBD_MD_MEA); CHECK_DEFINE_64X(OBD_MD_TSTATE); CHECK_DEFINE_64X(OBD_MD_FLXATTR); CHECK_DEFINE_64X(OBD_MD_FLXATTRLS); CHECK_DEFINE_64X(OBD_MD_FLXATTRRM); CHECK_DEFINE_64X(OBD_MD_FLACL); - CHECK_DEFINE_64X(OBD_MD_FLMDSCAPA); - CHECK_DEFINE_64X(OBD_MD_FLOSSCAPA); - CHECK_DEFINE_64X(OBD_MD_FLCKSPLIT); CHECK_DEFINE_64X(OBD_MD_FLCROSSREF); CHECK_DEFINE_64X(OBD_MD_FLGETATTRLOCK); CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION); @@ -709,7 +726,10 @@ check_obdo(void) CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32); CHECK_CVALUE_X(OBD_FL_CKSUM_ADLER); CHECK_CVALUE_X(OBD_FL_CKSUM_CRC32C); - CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD2); + CHECK_CVALUE_X(OBD_FL_CKSUM_T10IP512); + CHECK_CVALUE_X(OBD_FL_CKSUM_T10IP4K); + CHECK_CVALUE_X(OBD_FL_CKSUM_T10CRC512); + CHECK_CVALUE_X(OBD_FL_CKSUM_T10CRC4K); CHECK_CVALUE_X(OBD_FL_CKSUM_RSVD3); CHECK_CVALUE_X(OBD_FL_SHRINK_GRANT); CHECK_CVALUE_X(OBD_FL_MMAP); @@ -717,7 +737,6 @@ check_obdo(void) CHECK_CVALUE_X(OBD_FL_NOSPC_BLK); CHECK_CVALUE_X(OBD_FL_FLUSH); CHECK_CVALUE_X(OBD_FL_SHORT_IO); - CHECK_CVALUE_X(OBD_FL_LOCAL_MASK); } static void @@ -765,8 +784,8 @@ check_lov_mds_md_v3(void) CHECK_VALUE_X(LOV_PATTERN_RAID0); CHECK_VALUE_X(LOV_PATTERN_RAID1); - CHECK_VALUE_X(LOV_PATTERN_FIRST); - CHECK_VALUE_X(LOV_PATTERN_CMOBD); + CHECK_VALUE_X(LOV_PATTERN_MDT); + CHECK_VALUE_X(LOV_PATTERN_OVERSTRIPING); } static void @@ -779,9 +798,12 @@ check_lov_comp_md_entry_v1(void) CHECK_MEMBER(lov_comp_md_entry_v1, lcme_extent); CHECK_MEMBER(lov_comp_md_entry_v1, lcme_offset); CHECK_MEMBER(lov_comp_md_entry_v1, lcme_size); - CHECK_MEMBER(lov_comp_md_entry_v1, lcme_padding); + CHECK_MEMBER(lov_comp_md_entry_v1, lcme_layout_gen); + CHECK_MEMBER(lov_comp_md_entry_v1, lcme_timestamp); + CHECK_MEMBER(lov_comp_md_entry_v1, lcme_padding_1); CHECK_VALUE_X(LCME_FL_INIT); + CHECK_VALUE_X(LCME_FL_NEG); } static void @@ -794,11 +816,17 @@ check_lov_comp_md_v1(void) CHECK_MEMBER(lov_comp_md_v1, lcm_layout_gen); CHECK_MEMBER(lov_comp_md_v1, lcm_flags); CHECK_MEMBER(lov_comp_md_v1, lcm_entry_count); + CHECK_MEMBER(lov_comp_md_v1, lcm_mirror_count); CHECK_MEMBER(lov_comp_md_v1, lcm_padding1); CHECK_MEMBER(lov_comp_md_v1, lcm_padding2); CHECK_MEMBER(lov_comp_md_v1, lcm_entries[0]); CHECK_CDEFINE(LOV_MAGIC_COMP_V1); + + CHECK_VALUE(LCM_FL_NONE); + CHECK_VALUE(LCM_FL_RDONLY); + CHECK_VALUE(LCM_FL_WRITE_PENDING); + CHECK_VALUE(LCM_FL_SYNC_PENDING); } static void @@ -811,7 +839,8 @@ check_lmv_mds_md_v1(void) CHECK_MEMBER(lmv_mds_md_v1, lmv_master_mdt_index); CHECK_MEMBER(lmv_mds_md_v1, lmv_hash_type); CHECK_MEMBER(lmv_mds_md_v1, lmv_layout_version); - CHECK_MEMBER(lmv_mds_md_v1, lmv_padding1); + CHECK_MEMBER(lmv_mds_md_v1, lmv_migrate_offset); + CHECK_MEMBER(lmv_mds_md_v1, lmv_migrate_hash); CHECK_MEMBER(lmv_mds_md_v1, lmv_padding2); CHECK_MEMBER(lmv_mds_md_v1, lmv_padding3); CHECK_MEMBER(lmv_mds_md_v1, lmv_pool_name[LOV_MAXPOOLNAME]); @@ -820,10 +849,10 @@ check_lmv_mds_md_v1(void) CHECK_CDEFINE(LMV_MAGIC_V1); CHECK_CDEFINE(LMV_MAGIC_STRIPE); 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_SPACE); CHECK_CDEFINE(LMV_HASH_FLAG_LOST_LMV); + CHECK_CDEFINE(LMV_HASH_FLAG_BAD_TYPE); + CHECK_CDEFINE(LMV_HASH_FLAG_MIGRATION); } static void @@ -835,13 +864,15 @@ check_obd_statfs(void) CHECK_MEMBER(obd_statfs, os_blocks); CHECK_MEMBER(obd_statfs, os_bfree); CHECK_MEMBER(obd_statfs, os_bavail); + CHECK_MEMBER(obd_statfs, os_files); CHECK_MEMBER(obd_statfs, os_ffree); CHECK_MEMBER(obd_statfs, os_fsid); CHECK_MEMBER(obd_statfs, os_bsize); CHECK_MEMBER(obd_statfs, os_namelen); + CHECK_MEMBER(obd_statfs, os_maxbytes); CHECK_MEMBER(obd_statfs, os_state); CHECK_MEMBER(obd_statfs, os_fprecreated); - CHECK_MEMBER(obd_statfs, os_spare2); + CHECK_MEMBER(obd_statfs, os_granted); CHECK_MEMBER(obd_statfs, os_spare3); CHECK_MEMBER(obd_statfs, os_spare4); CHECK_MEMBER(obd_statfs, os_spare5); @@ -1007,19 +1038,39 @@ check_ll_fid(void) } static void +check_mds_op_bias(void) +{ + BLANK_LINE(); + CHECK_VALUE_X(MDS_CROSS_REF); + CHECK_VALUE_X(MDS_PERM_BYPASS); + CHECK_VALUE_X(MDS_QUOTA_IGNORE); + CHECK_VALUE_X(MDS_KEEP_ORPHAN); + CHECK_VALUE_X(MDS_RECOV_OPEN); + CHECK_VALUE_X(MDS_DATA_MODIFIED); + CHECK_VALUE_X(MDS_CREATE_VOLATILE); + CHECK_VALUE_X(MDS_OWNEROVERRIDE); + CHECK_VALUE_X(MDS_HSM_RELEASE); + CHECK_VALUE_X(MDS_CLOSE_LAYOUT_SWAP); + CHECK_VALUE_X(MDS_CLOSE_LAYOUT_MERGE); + CHECK_VALUE_X(MDS_CLOSE_RESYNC_DONE); + CHECK_VALUE_X(MDS_CLOSE_LAYOUT_SPLIT); +} + +static void check_mdt_body(void) { BLANK_LINE(); CHECK_STRUCT(mdt_body); CHECK_MEMBER(mdt_body, mbo_fid1); CHECK_MEMBER(mdt_body, mbo_fid2); - CHECK_MEMBER(mdt_body, mbo_handle); + CHECK_MEMBER(mdt_body, mbo_open_handle); CHECK_MEMBER(mdt_body, mbo_valid); CHECK_MEMBER(mdt_body, mbo_size); CHECK_MEMBER(mdt_body, mbo_mtime); CHECK_MEMBER(mdt_body, mbo_atime); CHECK_MEMBER(mdt_body, mbo_ctime); CHECK_MEMBER(mdt_body, mbo_blocks); + CHECK_MEMBER(mdt_body, mbo_version); CHECK_MEMBER(mdt_body, mbo_t_state); CHECK_MEMBER(mdt_body, mbo_fsuid); CHECK_MEMBER(mdt_body, mbo_fsgid); @@ -1030,7 +1081,7 @@ check_mdt_body(void) CHECK_MEMBER(mdt_body, mbo_flags); CHECK_MEMBER(mdt_body, mbo_rdev); CHECK_MEMBER(mdt_body, mbo_nlink); - CHECK_MEMBER(mdt_body, mbo_unused2); + CHECK_MEMBER(mdt_body, mbo_layout_gen); CHECK_MEMBER(mdt_body, mbo_suppgid); CHECK_MEMBER(mdt_body, mbo_eadatasize); CHECK_MEMBER(mdt_body, mbo_aclsize); @@ -1039,8 +1090,8 @@ check_mdt_body(void) CHECK_MEMBER(mdt_body, mbo_uid_h); CHECK_MEMBER(mdt_body, mbo_gid_h); CHECK_MEMBER(mdt_body, mbo_projid); - CHECK_MEMBER(mdt_body, mbo_padding_6); - CHECK_MEMBER(mdt_body, mbo_padding_7); + CHECK_MEMBER(mdt_body, mbo_dom_size); + CHECK_MEMBER(mdt_body, mbo_dom_blocks); CHECK_MEMBER(mdt_body, mbo_padding_8); CHECK_MEMBER(mdt_body, mbo_padding_9); CHECK_MEMBER(mdt_body, mbo_padding_10); @@ -1049,7 +1100,6 @@ check_mdt_body(void) CHECK_VALUE_O(MDS_FMODE_EXEC); CHECK_VALUE_O(MDS_OPEN_CREATED); - CHECK_VALUE_O(MDS_OPEN_CROSS); CHECK_VALUE_O(MDS_OPEN_CREAT); CHECK_VALUE_O(MDS_OPEN_EXCL); CHECK_VALUE_O(MDS_OPEN_TRUNC); @@ -1085,6 +1135,9 @@ check_mdt_body(void) CHECK_DEFINE_X(MDS_INODELOCK_UPDATE); CHECK_DEFINE_X(MDS_INODELOCK_OPEN); CHECK_DEFINE_X(MDS_INODELOCK_LAYOUT); + CHECK_DEFINE_X(MDS_INODELOCK_PERM); + CHECK_DEFINE_X(MDS_INODELOCK_XATTR); + CHECK_DEFINE_X(MDS_INODELOCK_DOM); } static void @@ -1092,7 +1145,7 @@ check_mdt_ioepoch(void) { BLANK_LINE(); CHECK_STRUCT(mdt_ioepoch); - CHECK_MEMBER(mdt_ioepoch, mio_handle); + CHECK_MEMBER(mdt_ioepoch, mio_open_handle); CHECK_MEMBER(mdt_ioepoch, mio_unused1); CHECK_MEMBER(mdt_ioepoch, mio_unused2); CHECK_MEMBER(mdt_ioepoch, mio_padding); @@ -1147,7 +1200,7 @@ check_mdt_rec_create(void) CHECK_MEMBER(mdt_rec_create, cr_suppgid2_h); CHECK_MEMBER(mdt_rec_create, cr_fid1); CHECK_MEMBER(mdt_rec_create, cr_fid2); - CHECK_MEMBER(mdt_rec_create, cr_old_handle); + CHECK_MEMBER(mdt_rec_create, cr_open_handle_old); CHECK_MEMBER(mdt_rec_create, cr_time); CHECK_MEMBER(mdt_rec_create, cr_rdev); CHECK_MEMBER(mdt_rec_create, cr_ioepoch); @@ -1283,6 +1336,36 @@ check_mdt_rec_setxattr(void) } static void +check_mdt_rec_resync(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mdt_rec_resync); + CHECK_MEMBER(mdt_rec_resync, rs_opcode); + CHECK_MEMBER(mdt_rec_resync, rs_cap); + CHECK_MEMBER(mdt_rec_resync, rs_fsuid); + CHECK_MEMBER(mdt_rec_resync, rs_fsuid_h); + CHECK_MEMBER(mdt_rec_resync, rs_fsgid); + CHECK_MEMBER(mdt_rec_resync, rs_fsgid_h); + CHECK_MEMBER(mdt_rec_resync, rs_suppgid1); + CHECK_MEMBER(mdt_rec_resync, rs_suppgid1_h); + CHECK_MEMBER(mdt_rec_resync, rs_suppgid2); + CHECK_MEMBER(mdt_rec_resync, rs_suppgid2_h); + CHECK_MEMBER(mdt_rec_resync, rs_fid); + CHECK_MEMBER(mdt_rec_resync, rs_padding0); + CHECK_MEMBER(mdt_rec_resync, rs_padding1); + CHECK_MEMBER(mdt_rec_resync, rs_padding2); + CHECK_MEMBER(mdt_rec_resync, rs_padding3); + CHECK_MEMBER(mdt_rec_resync, rs_padding4); + CHECK_MEMBER(mdt_rec_resync, rs_bias); + CHECK_MEMBER(mdt_rec_resync, rs_padding5); + CHECK_MEMBER(mdt_rec_resync, rs_padding6); + CHECK_MEMBER(mdt_rec_resync, rs_padding7); + CHECK_MEMBER(mdt_rec_resync, rs_padding8); + CHECK_MEMBER(mdt_rec_resync, rs_mirror_id); + CHECK_MEMBER(mdt_rec_resync, rs_padding9); +} + +static void check_mdt_rec_reint(void) { BLANK_LINE(); @@ -1309,6 +1392,7 @@ check_mdt_rec_reint(void) CHECK_MEMBER(mdt_rec_reint, rr_flags); CHECK_MEMBER(mdt_rec_reint, rr_flags_h); CHECK_MEMBER(mdt_rec_reint, rr_umask); + CHECK_MEMBER(mdt_rec_reint, rr_mirror_id); CHECK_MEMBER(mdt_rec_reint, rr_padding_4); } @@ -1375,6 +1459,7 @@ check_ldlm_inodebits(void) BLANK_LINE(); CHECK_STRUCT(ldlm_inodebits); CHECK_MEMBER(ldlm_inodebits, bits); + CHECK_MEMBER(ldlm_inodebits, try_bits); } static void @@ -1400,15 +1485,10 @@ check_ldlm_intent(void) 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 @@ -1732,7 +1812,7 @@ check_llog_changelog_user_rec(void) CHECK_STRUCT(llog_changelog_user_rec); CHECK_MEMBER(llog_changelog_user_rec, cur_hdr); CHECK_MEMBER(llog_changelog_user_rec, cur_id); - CHECK_MEMBER(llog_changelog_user_rec, cur_padding); + CHECK_MEMBER(llog_changelog_user_rec, cur_time); CHECK_MEMBER(llog_changelog_user_rec, cur_endrec); CHECK_MEMBER(llog_changelog_user_rec, cur_tail); } @@ -1787,12 +1867,7 @@ check_llogd_body(void) CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CREATE); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_READ_HEADER); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_WRITE_REC); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_CLOSE); - CHECK_CVALUE(LLOG_ORIGIN_CONNECT); - CHECK_CVALUE(LLOG_CATINFO); CHECK_CVALUE(LLOG_ORIGIN_HANDLE_PREV_BLOCK); - CHECK_CVALUE(LLOG_ORIGIN_HANDLE_DESTROY); CHECK_CVALUE(LLOG_FIRST_OPC); CHECK_CVALUE(LLOG_LAST_OPC); @@ -1989,7 +2064,9 @@ check_posix_acl_xattr_header(void) printf("#ifdef CONFIG_FS_POSIX_ACL\n"); CHECK_STRUCT_TYPEDEF(posix_acl_xattr_header); CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_version); + printf("#ifndef HAVE_STRUCT_POSIX_ACL_XATTR\n"); CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_entries); + printf("#endif /* HAVE_STRUCT_POSIX_ACL_XATTR */\n"); printf("#endif /* CONFIG_FS_POSIX_ACL */\n"); } @@ -2153,12 +2230,11 @@ check_hsm_copy(void) static void check_layout_intent(void) { - BLANK_LINE(); - CHECK_STRUCT(layout_intent); - CHECK_MEMBER(layout_intent, li_opc); - CHECK_MEMBER(layout_intent, li_flags); - CHECK_MEMBER(layout_intent, li_start); - CHECK_MEMBER(layout_intent, li_end); + BLANK_LINE(); + CHECK_STRUCT(layout_intent); + CHECK_MEMBER(layout_intent, li_opc); + CHECK_MEMBER(layout_intent, li_flags); + CHECK_MEMBER(layout_intent, li_extent); CHECK_VALUE(LAYOUT_INTENT_ACCESS); CHECK_VALUE(LAYOUT_INTENT_READ); @@ -2370,11 +2446,11 @@ static void check_lfsck_request(void) CHECK_MEMBER(lfsck_request, lr_padding_1); CHECK_MEMBER(lfsck_request, lr_padding_2); CHECK_MEMBER(lfsck_request, lr_padding_3); - + printf("#ifdef HAVE_SERVER_SUPPORT\n"); CHECK_VALUE_X(LFSCK_TYPE_SCRUB); CHECK_VALUE_X(LFSCK_TYPE_LAYOUT); CHECK_VALUE_X(LFSCK_TYPE_NAMESPACE); - + printf("#endif\n"); CHECK_VALUE(LE_LASTID_REBUILDING); CHECK_VALUE(LE_LASTID_REBUILT); CHECK_VALUE(LE_PHASE1_DONE); @@ -2451,74 +2527,88 @@ static void check_llog_update_record(void) CHECK_MEMBER(llog_update_record, lur_update_rec); } -static void system_string(char *cmdline, char *str, int len) -{ - int fds[2]; - int rc; - pid_t pid; - - rc = pipe(fds); - if (rc != 0) - abort(); - - pid = fork(); - if (pid == 0) { - /* child */ - int fd = fileno(stdout); - - rc = dup2(fds[1], fd); - if (rc != fd) - abort(); - - exit(system(cmdline)); - /* notreached */ - } else if ((int)pid < 0) { - abort(); - } else { - FILE *f = fdopen(fds[0], "r"); - - if (f == NULL) - abort(); - - close(fds[1]); - - if (fgets(str, len, f) == NULL) - abort(); - - if (waitpid(pid, &rc, 0) != pid) - abort(); - - if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0) - abort(); - - if (strnlen(str, len) == len) - str[len - 1] = 0; - - if (str[strlen(str) - 1] == '\n') - str[strlen(str) - 1] = 0; - - fclose(f); - } +static void +check_lustre_cfg(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lustre_cfg); + CHECK_MEMBER(lustre_cfg, lcfg_version); + CHECK_MEMBER(lustre_cfg, lcfg_command); + CHECK_MEMBER(lustre_cfg, lcfg_num); + CHECK_MEMBER(lustre_cfg, lcfg_flags); + CHECK_MEMBER(lustre_cfg, lcfg_nid); + CHECK_MEMBER(lustre_cfg, lcfg_nal); + CHECK_MEMBER(lustre_cfg, lcfg_bufcount); + CHECK_MEMBER(lustre_cfg, lcfg_buflens[0]); + + CHECK_VALUE_X(LCFG_ATTACH); + CHECK_VALUE_X(LCFG_DETACH); + CHECK_VALUE_X(LCFG_SETUP); + CHECK_VALUE_X(LCFG_CLEANUP); + CHECK_VALUE_X(LCFG_ADD_UUID); + CHECK_VALUE_X(LCFG_DEL_UUID); + CHECK_VALUE_X(LCFG_MOUNTOPT); + CHECK_VALUE_X(LCFG_DEL_MOUNTOPT); + CHECK_VALUE_X(LCFG_SET_TIMEOUT); + CHECK_VALUE_X(LCFG_SET_UPCALL); + CHECK_VALUE_X(LCFG_ADD_CONN); + CHECK_VALUE_X(LCFG_DEL_CONN); + CHECK_VALUE_X(LCFG_LOV_ADD_OBD); + CHECK_VALUE_X(LCFG_LOV_DEL_OBD); + CHECK_VALUE_X(LCFG_PARAM); + CHECK_VALUE_X(LCFG_MARKER); + CHECK_VALUE_X(LCFG_LOG_START); + CHECK_VALUE_X(LCFG_LOG_END); + CHECK_VALUE_X(LCFG_LOV_ADD_INA); + CHECK_VALUE_X(LCFG_ADD_MDC); + CHECK_VALUE_X(LCFG_DEL_MDC); + CHECK_VALUE_X(LCFG_SPTLRPC_CONF); + CHECK_VALUE_X(LCFG_POOL_NEW); + CHECK_VALUE_X(LCFG_POOL_ADD); + CHECK_VALUE_X(LCFG_POOL_REM); + CHECK_VALUE_X(LCFG_POOL_DEL); + CHECK_VALUE_X(LCFG_SET_LDLM_TIMEOUT); + CHECK_VALUE_X(LCFG_PRE_CLEANUP); + CHECK_VALUE_X(LCFG_SET_PARAM); + CHECK_VALUE_X(LCFG_NODEMAP_ADD); + CHECK_VALUE_X(LCFG_NODEMAP_DEL); + CHECK_VALUE_X(LCFG_NODEMAP_ADD_RANGE); + CHECK_VALUE_X(LCFG_NODEMAP_DEL_RANGE); + CHECK_VALUE_X(LCFG_NODEMAP_ADD_UIDMAP); + CHECK_VALUE_X(LCFG_NODEMAP_DEL_UIDMAP); + CHECK_VALUE_X(LCFG_NODEMAP_ADD_GIDMAP); + CHECK_VALUE_X(LCFG_NODEMAP_DEL_GIDMAP); + CHECK_VALUE_X(LCFG_NODEMAP_ACTIVATE); + CHECK_VALUE_X(LCFG_NODEMAP_ADMIN); + CHECK_VALUE_X(LCFG_NODEMAP_TRUSTED); + CHECK_VALUE_X(LCFG_NODEMAP_SQUASH_UID); + CHECK_VALUE_X(LCFG_NODEMAP_SQUASH_GID); + CHECK_VALUE_X(LCFG_NODEMAP_ADD_SHKEY); + CHECK_VALUE_X(LCFG_NODEMAP_DEL_SHKEY); + CHECK_VALUE_X(LCFG_NODEMAP_TEST_NID); + CHECK_VALUE_X(LCFG_NODEMAP_TEST_ID); + CHECK_VALUE_X(LCFG_NODEMAP_SET_FILESET); + CHECK_VALUE_X(LCFG_NODEMAP_DENY_UNKNOWN); + CHECK_VALUE_X(LCFG_NODEMAP_MAP_MODE); + CHECK_VALUE_X(LCFG_NODEMAP_AUDIT_MODE); + CHECK_VALUE_X(LCFG_NODEMAP_SET_SEPOL); + + CHECK_VALUE(PORTALS_CFG_TYPE); + CHECK_VALUE(LUSTRE_CFG_TYPE); } int main(int argc, char **argv) { - char unameinfo[80]; - char gccinfo[80]; - - system_string("uname -a", unameinfo, sizeof(unameinfo)); - system_string(CC " -v 2>&1 | tail -1", gccinfo, sizeof(gccinfo)); + BLANK_LINE(); printf ("void lustre_assert_wire_constants(void)\n" "{\n" - " /* Wire protocol assertions generated by 'wirecheck'\n" - " * (make -C lustre/utils newwiretest)\n" - " * running on %s\n" - " * with %s */\n" - "\n", unameinfo, gccinfo); + " /* Wire protocol assertions generated by 'wirecheck'\n" + " * (make -C lustre/utils newwiretest)\n" + " */\n"); - BLANK_LINE (); + BLANK_LINE(); COMMENT("Constants..."); CHECK_VALUE(PTL_RPC_MSG_REQUEST); @@ -2635,6 +2725,9 @@ main(int argc, char **argv) CHECK_VALUE_64X(MDS_ATTR_FROM_OPEN); CHECK_VALUE_64X(MDS_ATTR_BLOCKS); CHECK_VALUE_64X(MDS_ATTR_PROJID); + CHECK_VALUE_64X(MDS_ATTR_LSIZE); + CHECK_VALUE_64X(MDS_ATTR_LBLOCKS); + CHECK_VALUE_64X(MDS_ATTR_OVERRIDE); CHECK_VALUE(FLD_QUERY); CHECK_VALUE(FLD_READ); @@ -2697,8 +2790,6 @@ main(int argc, char **argv) CHECK_CVALUE(LQUOTA_RES_DT); CHECK_VALUE(OBD_PING); - CHECK_VALUE(OBD_LOG_CANCEL); - CHECK_VALUE(OBD_QC_CALLBACK); CHECK_VALUE(OBD_IDX_READ); CHECK_VALUE(OBD_LAST_OPC); @@ -2712,6 +2803,7 @@ main(int argc, char **argv) CHECK_VALUE(MGS_TARGET_REG); CHECK_VALUE(MGS_TARGET_DEL); CHECK_VALUE(MGS_SET_INFO); + CHECK_VALUE(MGS_CONFIG_READ); CHECK_VALUE(MGS_LAST_OPC); CHECK_VALUE(SEC_CTX_INIT); @@ -2742,7 +2834,10 @@ main(int argc, char **argv) CHECK_VALUE(OUT_XATTR_DEL); CHECK_VALUE(OUT_PUNCH); CHECK_VALUE(OUT_READ); + CHECK_VALUE(OUT_NOOP); + CHECK_VALUE(OUT_XATTR_LIST); + check_som_attrs(); check_hsm_attrs(); check_ost_id(); check_lu_dirent(); @@ -2769,6 +2864,7 @@ main(int argc, char **argv) check_niobuf_remote(); check_ost_body(); check_ll_fid(); + check_mds_op_bias(); check_mdt_body(); check_mdt_ioepoch(); check_mdt_rec_setattr(); @@ -2777,6 +2873,7 @@ main(int argc, char **argv) check_mdt_rec_unlink(); check_mdt_rec_rename(); check_mdt_rec_setxattr(); + check_mdt_rec_resync(); check_mdt_rec_reint(); check_lmv_desc(); check_lov_desc(); @@ -2871,7 +2968,9 @@ main(int argc, char **argv) check_update_records(); check_llog_update_record(); - printf("}\n\n"); + check_lustre_cfg(); + + printf("}\n"); return 0; }