X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=38c9ec41d6c8379b48fc14abeb6f8df9aab304f7;hb=3442db6faf685fbdbd092bdfdc8d273e4990a141;hp=2e997c753fb6b892b7ffcf02a5f4c6a7f0dd7b48;hpb=cd764a5462697261a9a6b1e6c6858c75d969bae1;p=fs%2Flustre-release.git diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 2e997c7..38c9ec4 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -15,11 +15,7 @@ * * You should have received a copy of the GNU General Public License * version 2 along with this program; If not, see - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,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, 2016, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,12 +31,16 @@ */ #include +#include +#include #include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #define BLANK_LINE() \ do { \ @@ -206,11 +206,31 @@ check_lustre_mdt_attrs(void) CHECK_MEMBER(lustre_mdt_attrs, lma_compat); CHECK_MEMBER(lustre_mdt_attrs, lma_incompat); CHECK_MEMBER(lustre_mdt_attrs, lma_self_fid); - CHECK_VALUE_X(LMAI_RELEASED); CHECK_VALUE_X(LMAC_HSM); CHECK_VALUE_X(LMAC_NOT_IN_OI); CHECK_VALUE_X(LMAC_FID_ON_OST); + CHECK_VALUE_X(LMAC_STRIPE_INFO); + CHECK_VALUE_X(LMAC_COMP_INFO); + + CHECK_VALUE_X(LMAI_RELEASED); + CHECK_VALUE_X(LMAI_AGENT); + CHECK_VALUE_X(LMAI_REMOTE_PARENT); + CHECK_VALUE_X(LMAI_STRIPED); + CHECK_VALUE_X(LMAI_ORPHAN); +} + +static void +check_lustre_ost_attrs(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lustre_ost_attrs); + CHECK_MEMBER(lustre_ost_attrs, loa_lma); + CHECK_MEMBER(lustre_ost_attrs, loa_parent_fid); + CHECK_MEMBER(lustre_ost_attrs, loa_stripe_size); + CHECK_MEMBER(lustre_ost_attrs, loa_comp_id); + CHECK_MEMBER(lustre_ost_attrs, loa_comp_start); + CHECK_MEMBER(lustre_ost_attrs, loa_comp_end); } static void @@ -304,6 +324,39 @@ check_lu_dirpage(void) } static void +check_lu_ladvise(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lu_ladvise); + CHECK_MEMBER(lu_ladvise, lla_advice); + CHECK_MEMBER(lu_ladvise, lla_value1); + CHECK_MEMBER(lu_ladvise, lla_value2); + CHECK_MEMBER(lu_ladvise, lla_start); + CHECK_MEMBER(lu_ladvise, lla_end); + CHECK_MEMBER(lu_ladvise, lla_value3); + CHECK_MEMBER(lu_ladvise, lla_value4); + CHECK_VALUE(LU_LADVISE_WILLREAD); + CHECK_VALUE(LU_LADVISE_DONTNEED); +} + +static void +check_ladvise_hdr(void) +{ + BLANK_LINE(); + CHECK_STRUCT(ladvise_hdr); + CHECK_MEMBER(ladvise_hdr, lah_magic); + CHECK_MEMBER(ladvise_hdr, lah_count); + CHECK_MEMBER(ladvise_hdr, lah_flags); + CHECK_MEMBER(ladvise_hdr, lah_value1); + CHECK_MEMBER(ladvise_hdr, lah_value2); + CHECK_MEMBER(ladvise_hdr, lah_value3); + CHECK_MEMBER(ladvise_hdr, lah_advise); + + CHECK_VALUE(LF_ASYNC); + CHECK_VALUE(LADVISE_MAGIC); +} + +static void check_lustre_handle(void) { BLANK_LINE(); @@ -355,7 +408,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 +434,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); @@ -425,6 +484,14 @@ check_ptlrpc_body(void) CHECK_VALUE_X(MSG_CONNECT_TRANSNO); } +/* XXX README XXX: + * Please DO NOT add flag values here before first ensuring that this same + * flag value is not in use on some other branch. Please clear any such + * changes with senior engineers before starting to use a new flag. Then, + * submit a small patch against EVERY branch that ONLY adds the new flag, + * updates obd_connect_names[] for lprocfs_rd_connect_flags(), adds the + * flag to check_obd_connect_data(), and updates wiretests accordingly, so it + * can be approved and landed easily to reserve the flag for future use. */ static void check_obd_connect_data(void) { @@ -436,10 +503,10 @@ check_obd_connect_data(void) CHECK_MEMBER(obd_connect_data, ocd_index); CHECK_MEMBER(obd_connect_data, ocd_brw_size); CHECK_MEMBER(obd_connect_data, ocd_ibits_known); - CHECK_MEMBER(obd_connect_data, ocd_blocksize); - CHECK_MEMBER(obd_connect_data, ocd_inodespace); - CHECK_MEMBER(obd_connect_data, ocd_grant_extent); - CHECK_MEMBER(obd_connect_data, ocd_unused); + CHECK_MEMBER(obd_connect_data, ocd_grant_blkbits); + CHECK_MEMBER(obd_connect_data, ocd_grant_inobits); + CHECK_MEMBER(obd_connect_data, ocd_grant_tax_kb); + CHECK_MEMBER(obd_connect_data, ocd_grant_max_blks); CHECK_MEMBER(obd_connect_data, ocd_transno); CHECK_MEMBER(obd_connect_data, ocd_group); CHECK_MEMBER(obd_connect_data, ocd_cksum_types); @@ -449,7 +516,7 @@ check_obd_connect_data(void) 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, ocd_connect_flags2); CHECK_MEMBER(obd_connect_data, padding3); CHECK_MEMBER(obd_connect_data, padding4); CHECK_MEMBER(obd_connect_data, padding5); @@ -473,11 +540,11 @@ 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); - CHECK_DEFINE_64X(OBD_CONNECT_JOIN); + CHECK_DEFINE_64X(OBD_CONNECT_BARRIER); CHECK_DEFINE_64X(OBD_CONNECT_ATTRFID); CHECK_DEFINE_64X(OBD_CONNECT_NODEVOH); CHECK_DEFINE_64X(OBD_CONNECT_RMT_CLIENT); @@ -521,6 +588,13 @@ 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_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_VALUE_X(OBD_CKSUM_CRC32); CHECK_VALUE_X(OBD_CKSUM_ADLER); @@ -528,6 +602,18 @@ check_obd_connect_data(void) } static void +check_ost_layout(void) +{ + BLANK_LINE(); + CHECK_STRUCT(ost_layout); + CHECK_MEMBER(ost_layout, ol_stripe_size); + CHECK_MEMBER(ost_layout, ol_stripe_count); + CHECK_MEMBER(ost_layout, ol_comp_start); + CHECK_MEMBER(ost_layout, ol_comp_end); + CHECK_MEMBER(ost_layout, ol_comp_id); +} + +static void check_obdo(void) { BLANK_LINE(); @@ -553,10 +639,12 @@ check_obdo(void) CHECK_MEMBER(obdo, o_stripe_idx); CHECK_MEMBER(obdo, o_parent_ver); CHECK_MEMBER(obdo, o_handle); - CHECK_MEMBER(obdo, o_lcookie); + CHECK_MEMBER(obdo, o_layout); + CHECK_MEMBER(obdo, o_layout_version); CHECK_MEMBER(obdo, o_uid_h); CHECK_MEMBER(obdo, o_gid_h); CHECK_MEMBER(obdo, o_data_version); + CHECK_MEMBER(obdo, o_projid); CHECK_MEMBER(obdo, o_padding_4); CHECK_MEMBER(obdo, o_padding_5); CHECK_MEMBER(obdo, o_padding_6); @@ -597,17 +685,16 @@ check_obdo(void) CHECK_DEFINE_64X(OBD_MD_FLXATTRLS); CHECK_DEFINE_64X(OBD_MD_FLXATTRRM); CHECK_DEFINE_64X(OBD_MD_FLACL); - CHECK_DEFINE_64X(OBD_MD_FLRMTPERM); 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_FLRMTLSETFACL); - CHECK_DEFINE_64X(OBD_MD_FLRMTLGETFACL); - CHECK_DEFINE_64X(OBD_MD_FLRMTRSETFACL); - CHECK_DEFINE_64X(OBD_MD_FLRMTRGETFACL); CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION); + CHECK_DEFINE_64X(OBD_MD_CLOSE_INTENT_EXECED); + CHECK_DEFINE_64X(OBD_MD_DEFAULT_MEA); + CHECK_DEFINE_64X(OBD_MD_FLOSTLAYOUT); + CHECK_DEFINE_64X(OBD_MD_FLPROJID); CHECK_CVALUE_X(OBD_FL_INLINEDATA); CHECK_CVALUE_X(OBD_FL_OBDMDEXISTS); @@ -631,7 +718,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 @@ -679,11 +765,50 @@ 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_MDT); CHECK_VALUE_X(LOV_PATTERN_CMOBD); } static void +check_lov_comp_md_entry_v1(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lov_comp_md_entry_v1); + CHECK_MEMBER(lov_comp_md_entry_v1, lcme_id); + CHECK_MEMBER(lov_comp_md_entry_v1, lcme_flags); + 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_VALUE_X(LCME_FL_INIT); + CHECK_VALUE_X(LCME_FL_NEG); +} + +static void +check_lov_comp_md_v1(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lov_comp_md_v1); + CHECK_MEMBER(lov_comp_md_v1, lcm_magic); + CHECK_MEMBER(lov_comp_md_v1, lcm_size); + 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_NOT_FLR); + CHECK_VALUE(LCM_FL_RDONLY); + CHECK_VALUE(LCM_FL_WRITE_PENDING); + CHECK_VALUE(LCM_FL_SYNC_PENDING); +} + +static void check_lmv_mds_md_v1(void) { BLANK_LINE(); @@ -741,6 +866,7 @@ check_obd_ioobj(void) CHECK_MEMBER(obd_ioobj, ioo_oid); CHECK_MEMBER(obd_ioobj, ioo_max_brw); CHECK_MEMBER(obd_ioobj, ioo_bufcnt); + CHECK_VALUE(IOOBJ_MAX_BRW_BITS); } static void @@ -919,9 +1045,9 @@ check_mdt_body(void) 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); - CHECK_MEMBER(mdt_body, mbo_padding_6); - CHECK_MEMBER(mdt_body, mbo_padding_7); + CHECK_MEMBER(mdt_body, mbo_projid); + 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); @@ -950,11 +1076,17 @@ check_mdt_body(void) /* these should be identical to their EXT3_*_FL counterparts, and * are redefined only to avoid dragging in ext3_fs.h */ - CHECK_DEFINE_X(LUSTRE_SYNC_FL); - CHECK_DEFINE_X(LUSTRE_IMMUTABLE_FL); - CHECK_DEFINE_X(LUSTRE_APPEND_FL); - CHECK_DEFINE_X(LUSTRE_NOATIME_FL); - CHECK_DEFINE_X(LUSTRE_DIRSYNC_FL); + CHECK_VALUE_X(LUSTRE_SYNC_FL); + CHECK_VALUE_X(LUSTRE_IMMUTABLE_FL); + CHECK_VALUE_X(LUSTRE_APPEND_FL); + CHECK_VALUE_X(LUSTRE_NODUMP_FL); + CHECK_VALUE_X(LUSTRE_NOATIME_FL); + CHECK_VALUE_X(LUSTRE_INDEX_FL); + CHECK_VALUE_X(LUSTRE_ORPHAN_FL); + CHECK_VALUE_X(LUSTRE_DIRSYNC_FL); + CHECK_VALUE_X(LUSTRE_TOPDIR_FL); + CHECK_VALUE_X(LUSTRE_DIRECTIO_FL); + CHECK_VALUE_X(LUSTRE_INLINE_DATA_FL); CHECK_DEFINE_X(MDS_INODELOCK_LOOKUP); CHECK_DEFINE_X(MDS_INODELOCK_UPDATE); @@ -974,25 +1106,6 @@ check_mdt_ioepoch(void) } static void -check_mdt_remote_perm(void) -{ - BLANK_LINE(); - CHECK_STRUCT(mdt_remote_perm); - CHECK_MEMBER(mdt_remote_perm, rp_uid); - CHECK_MEMBER(mdt_remote_perm, rp_gid); - CHECK_MEMBER(mdt_remote_perm, rp_fsuid); - CHECK_MEMBER(mdt_remote_perm, rp_fsgid); - CHECK_MEMBER(mdt_remote_perm, rp_access_perm); - CHECK_MEMBER(mdt_remote_perm, rp_padding); - - CHECK_VALUE_X(CFS_SETUID_PERM); - CHECK_VALUE_X(CFS_SETGID_PERM); - CHECK_VALUE_X(CFS_SETGRP_PERM); - CHECK_VALUE_X(CFS_RMTACL_PERM); - CHECK_VALUE_X(CFS_RMTOWN_PERM); -} - -static void check_mdt_rec_setattr(void) { BLANK_LINE(); @@ -1019,7 +1132,7 @@ check_mdt_rec_setattr(void) CHECK_MEMBER(mdt_rec_setattr, sa_attr_flags); CHECK_MEMBER(mdt_rec_setattr, sa_mode); CHECK_MEMBER(mdt_rec_setattr, sa_bias); - CHECK_MEMBER(mdt_rec_setattr, sa_padding_3); + CHECK_MEMBER(mdt_rec_setattr, sa_projid); CHECK_MEMBER(mdt_rec_setattr, sa_padding_4); CHECK_MEMBER(mdt_rec_setattr, sa_padding_5); } @@ -1177,6 +1290,35 @@ 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_padding9); +} + +static void check_mdt_rec_reint(void) { BLANK_LINE(); @@ -1269,6 +1411,7 @@ check_ldlm_inodebits(void) BLANK_LINE(); CHECK_STRUCT(ldlm_inodebits); CHECK_MEMBER(ldlm_inodebits, bits); + CHECK_MEMBER(ldlm_inodebits, try_bits); } static void @@ -1289,6 +1432,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 +1454,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); } @@ -1391,7 +1548,25 @@ check_ldlm_gl_lquota_desc(void) CHECK_MEMBER(ldlm_gl_lquota_desc, gl_pad2); } +static void check_ldlm_gl_barrier_desc(void) +{ + BLANK_LINE(); + CHECK_STRUCT(ldlm_gl_barrier_desc); + CHECK_MEMBER(ldlm_gl_barrier_desc, lgbd_status); + CHECK_MEMBER(ldlm_gl_barrier_desc, lgbd_timeout); + CHECK_MEMBER(ldlm_gl_barrier_desc, lgbd_padding); +} + +static void check_ldlm_barrier_lvb(void) +{ + BLANK_LINE(); + CHECK_STRUCT(barrier_lvb); + CHECK_MEMBER(barrier_lvb, lvb_status); + CHECK_MEMBER(barrier_lvb, lvb_index); + CHECK_MEMBER(barrier_lvb, lvb_padding); +} +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0) static void check_mgs_send_param(void) { @@ -1400,6 +1575,7 @@ check_mgs_send_param(void) CHECK_CVALUE(MGS_PARAM_MAXLEN); CHECK_MEMBER(mgs_send_param, mgs_param[MGS_PARAM_MAXLEN]); } +#endif static void check_cfg_marker(void) @@ -1518,6 +1694,7 @@ check_llog_setattr64_rec(void) CHECK_MEMBER(llog_setattr64_rec, lsr_gid_h); CHECK_MEMBER(llog_setattr64_rec, lsr_valid); CHECK_MEMBER(llog_setattr64_rec, lsr_tail); + CHECK_MEMBER(llog_setattr64_rec_v2, lsr_projid); } static void @@ -1592,7 +1769,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); } @@ -1629,20 +1806,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 -check_llog_cookie(void) -{ - BLANK_LINE(); - CHECK_STRUCT(llog_cookie); - CHECK_MEMBER(llog_cookie, lgc_lgl); - CHECK_MEMBER(llog_cookie, lgc_subsys); - CHECK_MEMBER(llog_cookie, lgc_index); - CHECK_MEMBER(llog_cookie, lgc_padding); } static void @@ -1743,6 +1906,51 @@ check_mgs_target_info(void) } static void +check_mgs_nidtbl_entry(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mgs_nidtbl_entry); + CHECK_MEMBER(mgs_nidtbl_entry, mne_version); + CHECK_MEMBER(mgs_nidtbl_entry, mne_instance); + CHECK_MEMBER(mgs_nidtbl_entry, mne_index); + CHECK_MEMBER(mgs_nidtbl_entry, mne_length); + CHECK_MEMBER(mgs_nidtbl_entry, mne_type); + CHECK_MEMBER(mgs_nidtbl_entry, mne_nid_type); + CHECK_MEMBER(mgs_nidtbl_entry, mne_nid_size); + CHECK_MEMBER(mgs_nidtbl_entry, mne_nid_count); + CHECK_MEMBER(mgs_nidtbl_entry, u.nids[0]); +} + +static void +check_mgs_config_body(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mgs_config_body); + CHECK_MEMBER(mgs_config_body, mcb_name); + CHECK_MEMBER(mgs_config_body, mcb_offset); + CHECK_MEMBER(mgs_config_body, mcb_type); + CHECK_MEMBER(mgs_config_body, mcb_nm_cur_pass); + CHECK_MEMBER(mgs_config_body, mcb_bits); + CHECK_MEMBER(mgs_config_body, mcb_units); + + CHECK_CVALUE(CONFIG_T_CONFIG); + CHECK_CVALUE(CONFIG_T_SPTLRPC); + CHECK_CVALUE(CONFIG_T_RECOVER); + CHECK_CVALUE(CONFIG_T_PARAMS); + CHECK_CVALUE(CONFIG_T_NODEMAP); + CHECK_CVALUE(CONFIG_T_BARRIER); +} + +static void +check_mgs_config_res(void) +{ + BLANK_LINE(); + CHECK_STRUCT(mgs_config_res); + CHECK_MEMBER(mgs_config_res, mcr_offset); + CHECK_MEMBER(mgs_config_res, mcr_size); +} + +static void check_lustre_capa(void) { BLANK_LINE(); @@ -1780,7 +1988,7 @@ check_getinfo_fid2path(void) CHECK_MEMBER(getinfo_fid2path, gf_recno); CHECK_MEMBER(getinfo_fid2path, gf_linkno); CHECK_MEMBER(getinfo_fid2path, gf_pathlen); - CHECK_MEMBER(getinfo_fid2path, gf_path[0]); + CHECK_MEMBER(getinfo_fid2path, gf_u.gf_path[0]); } /* We don't control the definitions of posix_acl_xattr_{entry,header} @@ -1873,8 +2081,8 @@ check_link_ea_header(void) CHECK_MEMBER(link_ea_header, leh_magic); CHECK_MEMBER(link_ea_header, leh_reccount); CHECK_MEMBER(link_ea_header, leh_len); - CHECK_MEMBER(link_ea_header, padding1); - CHECK_MEMBER(link_ea_header, padding2); + CHECK_MEMBER(link_ea_header, leh_overflow_time); + CHECK_MEMBER(link_ea_header, leh_padding); CHECK_CDEFINE(LINK_EA_MAGIC); } @@ -1982,12 +2190,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); @@ -2069,7 +2276,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 +2314,77 @@ 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_nodemap_cluster_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(nodemap_cluster_rec); + CHECK_MEMBER(nodemap_cluster_rec, ncr_name); + CHECK_MEMBER(nodemap_cluster_rec, ncr_flags); + CHECK_MEMBER(nodemap_cluster_rec, ncr_padding1); + CHECK_MEMBER(nodemap_cluster_rec, ncr_padding2); + CHECK_MEMBER(nodemap_cluster_rec, ncr_squash_uid); + CHECK_MEMBER(nodemap_cluster_rec, ncr_squash_gid); +} + +static void check_nodemap_range_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(nodemap_range_rec); + CHECK_MEMBER(nodemap_range_rec, nrr_start_nid); + CHECK_MEMBER(nodemap_range_rec, nrr_end_nid); + CHECK_MEMBER(nodemap_range_rec, nrr_padding1); + CHECK_MEMBER(nodemap_range_rec, nrr_padding2); +} + +static void check_nodemap_id_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(nodemap_id_rec); + CHECK_MEMBER(nodemap_id_rec, nir_id_fs); + CHECK_MEMBER(nodemap_id_rec, nir_padding1); + CHECK_MEMBER(nodemap_id_rec, nir_padding2); + CHECK_MEMBER(nodemap_id_rec, nir_padding3); + CHECK_MEMBER(nodemap_id_rec, nir_padding4); +} + +static void check_nodemap_global_rec(void) +{ + BLANK_LINE(); + CHECK_STRUCT(nodemap_global_rec); + CHECK_MEMBER(nodemap_global_rec, ngr_is_active); + CHECK_MEMBER(nodemap_global_rec, ngr_padding1); + CHECK_MEMBER(nodemap_global_rec, ngr_padding2); + CHECK_MEMBER(nodemap_global_rec, ngr_padding3); + CHECK_MEMBER(nodemap_global_rec, ngr_padding4); + CHECK_MEMBER(nodemap_global_rec, ngr_padding5); + CHECK_MEMBER(nodemap_global_rec, ngr_padding6); +} + +static void check_nodemap_rec(void) +{ + BLANK_LINE(); + CHECK_UNION(nodemap_rec); +} + static void check_lfsck_request(void) { BLANK_LINE(); @@ -2123,9 +2401,11 @@ static void check_lfsck_request(void) CHECK_MEMBER(lfsck_request, lr_flags); CHECK_MEMBER(lfsck_request, lr_fid); CHECK_MEMBER(lfsck_request, lr_fid2); - CHECK_MEMBER(lfsck_request, lr_fid3); + CHECK_MEMBER(lfsck_request, lr_comp_id); + CHECK_MEMBER(lfsck_request, lr_padding_0); 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); @@ -2138,12 +2418,9 @@ static void check_lfsck_request(void) CHECK_VALUE(LE_START); CHECK_VALUE(LE_STOP); CHECK_VALUE(LE_QUERY); - CHECK_VALUE(LE_FID_ACCESSED); CHECK_VALUE(LE_PEER_EXIT); CHECK_VALUE(LE_CONDITIONAL_DESTROY); CHECK_VALUE(LE_PAIRS_VERIFY); - CHECK_VALUE(LE_SKIP_NLINK_DECLARE); - CHECK_VALUE(LE_SKIP_NLINK); CHECK_VALUE(LE_SET_LMV_MASTER); CHECK_VALUE(LE_SET_LMV_SLAVE); @@ -2152,6 +2429,7 @@ static void check_lfsck_request(void) CHECK_VALUE_X(LEF_SET_LMV_HASH); CHECK_VALUE_X(LEF_SET_LMV_ALL); CHECK_VALUE_X(LEF_RECHECK_NAME_HASH); + CHECK_VALUE_X(LEF_QUERY_ALL); } static void check_lfsck_reply(void) @@ -2160,77 +2438,67 @@ static void check_lfsck_reply(void) CHECK_STRUCT(lfsck_reply); CHECK_MEMBER(lfsck_reply, lr_status); CHECK_MEMBER(lfsck_reply, lr_padding_1); - CHECK_MEMBER(lfsck_reply, lr_padding_2); + CHECK_MEMBER(lfsck_reply, lr_repaired); } -static void system_string(char *cmdline, char *str, int len) +static void check_update_params(void) { - 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(); + BLANK_LINE(); + CHECK_STRUCT(update_params); + CHECK_MEMBER(update_params, up_params); +} - if (waitpid(pid, &rc, 0) != pid) - abort(); +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); +} - if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0) - abort(); +static void check_update_ops(void) +{ + BLANK_LINE(); + CHECK_STRUCT(update_ops); + CHECK_MEMBER(update_ops, uops_op); +} - if (strnlen(str, len) == len) - str[len - 1] = 0; +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); - if (str[strlen(str) - 1] == '\n') - str[strlen(str) - 1] = 0; + CHECK_VALUE_X(UPDATE_RECORD_CONTINUE); +} - fclose(f); - } +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); } 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); @@ -2262,6 +2530,7 @@ main(int argc, char **argv) CHECK_VALUE(OST_QUOTACHECK); CHECK_VALUE(OST_QUOTACTL); CHECK_VALUE(OST_QUOTA_ADJUST_QUNIT); + CHECK_VALUE(OST_LADVISE); CHECK_VALUE(OST_LAST_OPC); CHECK_DEFINE_64X(OBD_OBJECT_EOF); @@ -2280,7 +2549,7 @@ main(int argc, char **argv) CHECK_VALUE(MDS_READPAGE); CHECK_VALUE(MDS_CONNECT); CHECK_VALUE(MDS_DISCONNECT); - CHECK_VALUE(MDS_GETSTATUS); + CHECK_VALUE(MDS_GET_ROOT); CHECK_VALUE(MDS_STATFS); CHECK_VALUE(MDS_PIN); CHECK_VALUE(MDS_UNPIN); @@ -2329,8 +2598,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); @@ -2347,6 +2614,7 @@ main(int argc, char **argv) CHECK_VALUE_64X(MDS_ATTR_CTIME_SET); CHECK_VALUE_64X(MDS_ATTR_FROM_OPEN); CHECK_VALUE_64X(MDS_ATTR_BLOCKS); + CHECK_VALUE_64X(MDS_ATTR_PROJID); CHECK_VALUE(FLD_QUERY); CHECK_VALUE(FLD_READ); @@ -2436,6 +2704,7 @@ main(int argc, char **argv) CHECK_STRUCT(obd_uuid); check_lu_seq_range(); check_lustre_mdt_attrs(); + check_lustre_ost_attrs(); CHECK_VALUE(OUT_CREATE); CHECK_VALUE(OUT_DESTROY); @@ -2459,14 +2728,19 @@ main(int argc, char **argv) check_lu_dirent(); check_luda_type(); check_lu_dirpage(); + check_lu_ladvise(); + check_ladvise_hdr(); check_lustre_handle(); check_lustre_msg_v2(); check_ptlrpc_body(); check_obd_connect_data(); + check_ost_layout(); check_obdo(); check_lov_ost_data_v1(); check_lov_mds_md_v1(); check_lov_mds_md_v3(); + check_lov_comp_md_entry_v1(); + check_lov_comp_md_v1(); check_lmv_mds_md_v1(); check_obd_statfs(); check_obd_ioobj(); @@ -2477,13 +2751,13 @@ main(int argc, char **argv) check_ll_fid(); check_mdt_body(); check_mdt_ioepoch(); - check_mdt_remote_perm(); check_mdt_rec_setattr(); check_mdt_rec_create(); check_mdt_rec_link(); 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(); @@ -2500,7 +2774,11 @@ main(int argc, char **argv) check_ldlm_ost_lvb(); check_ldlm_lquota_lvb(); check_ldlm_gl_lquota_desc(); + check_ldlm_gl_barrier_desc(); + check_ldlm_barrier_lvb(); +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0) check_mgs_send_param(); +#endif check_cfg_marker(); check_llog_logid(); check_llog_catid(); @@ -2520,12 +2798,14 @@ main(int argc, char **argv) check_llog_gen(); check_llog_gen_rec(); check_llog_log_hdr(); - check_llog_cookie(); check_llogd_body(); check_llogd_conn_body(); check_ll_fiemap_info_key(); check_quota_body(); check_mgs_target_info(); + check_mgs_nidtbl_entry(); + check_mgs_config_body(); + check_mgs_config_res(); check_lustre_capa(); check_lustre_capa_key(); check_getinfo_fid2path(); @@ -2554,10 +2834,24 @@ 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_nodemap_cluster_rec(); + check_nodemap_range_rec(); + check_nodemap_id_rec(); + check_nodemap_global_rec(); + check_nodemap_rec(); 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;