X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=d912f754f9c62a41a1ece60b1b3381307f967e61;hb=bf959135d50c2e7e3d4414a6792f63665c6da22c;hp=5ce41b2abd1ab484acfd894c81cf3b57d62f8732;hpb=aa37f159e721723c3a719592c4d75df4c774b46c;p=fs%2Flustre-release.git diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 5ce41b2..d912f75 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -291,6 +291,7 @@ check_lu_dirpage(void) CHECK_VALUE(LDF_EMPTY); CHECK_VALUE(LDF_COLLIDE); CHECK_VALUE(LU_PAGE_SIZE); + CHECK_UNION(lu_page); } static void @@ -496,6 +497,7 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_EINPROGRESS); CHECK_DEFINE_64X(OBD_CONNECT_GRANT_PARAM); CHECK_DEFINE_64X(OBD_CONNECT_LIGHTWEIGHT); + CHECK_DEFINE_64X(OBD_CONNECT_SHORTIO); CHECK_VALUE_X(OBD_CKSUM_CRC32); CHECK_VALUE_X(OBD_CKSUM_ADLER); @@ -700,9 +702,14 @@ check_obd_ioobj(void) static void check_obd_quotactl(void) { + BLANK_LINE(); CHECK_UNION(lquota_id); + BLANK_LINE(); + CHECK_VALUE(QUOTABLOCK_BITS); + CHECK_VALUE(QUOTABLOCK_SIZE); + BLANK_LINE(); CHECK_STRUCT(obd_quotactl); CHECK_MEMBER(obd_quotactl, qc_cmd); @@ -757,6 +764,43 @@ check_obd_quotactl(void) } static void +check_obd_idx_read(void) +{ + BLANK_LINE(); + CHECK_STRUCT(idx_info); + CHECK_MEMBER(idx_info, ii_magic); + CHECK_MEMBER(idx_info, ii_flags); + CHECK_MEMBER(idx_info, ii_count); + CHECK_MEMBER(idx_info, ii_pad0); + CHECK_MEMBER(idx_info, ii_attrs); + CHECK_MEMBER(idx_info, ii_fid); + CHECK_MEMBER(idx_info, ii_version); + CHECK_MEMBER(idx_info, ii_hash_start); + CHECK_MEMBER(idx_info, ii_hash_end); + CHECK_MEMBER(idx_info, ii_keysize); + CHECK_MEMBER(idx_info, ii_recsize); + CHECK_MEMBER(idx_info, ii_pad1); + CHECK_MEMBER(idx_info, ii_pad2); + CHECK_MEMBER(idx_info, ii_pad3); + CHECK_CDEFINE(IDX_INFO_MAGIC); + + BLANK_LINE(); + CHECK_STRUCT(lu_idxpage); + CHECK_MEMBER(lu_idxpage, lip_magic); + CHECK_MEMBER(lu_idxpage, lip_flags); + CHECK_MEMBER(lu_idxpage, lip_nr); + CHECK_MEMBER(lu_idxpage, lip_pad0); + + CHECK_CDEFINE(LIP_MAGIC); + CHECK_VALUE(LIP_HDR_SIZE); + + CHECK_VALUE(II_FL_NOHASH); + CHECK_VALUE(II_FL_VARKEY); + CHECK_VALUE(II_FL_VARREC); + CHECK_VALUE(II_FL_NONUNQ); +} + +static void check_niobuf_remote(void) { BLANK_LINE(); @@ -1264,7 +1308,7 @@ check_ldlm_reply(void) } static void -check_ldlm_lvb(void) +check_ldlm_ost_lvb(void) { BLANK_LINE(); CHECK_STRUCT(ost_lvb); @@ -1276,6 +1320,34 @@ check_ldlm_lvb(void) } static void +check_ldlm_lquota_lvb(void) +{ + BLANK_LINE(); + CHECK_STRUCT(lquota_lvb); + CHECK_MEMBER(lquota_lvb, lvb_flags); + CHECK_MEMBER(lquota_lvb, lvb_id_may_rel); + CHECK_MEMBER(lquota_lvb, lvb_id_rel); + CHECK_MEMBER(lquota_lvb, lvb_id_qunit); + CHECK_MEMBER(lquota_lvb, lvb_pad1); + CHECK_VALUE(LQUOTA_FL_EDQUOT); +} + +static void +check_ldlm_gl_lquota_desc(void) +{ + BLANK_LINE(); + CHECK_STRUCT(ldlm_gl_lquota_desc); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_id); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_flags); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_ver); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_hardlimit); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_softlimit); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_pad1); + CHECK_MEMBER(ldlm_gl_lquota_desc, gl_pad2); +} + + +static void check_mgs_send_param(void) { BLANK_LINE(); @@ -1577,15 +1649,20 @@ check_ll_fiemap_info_key(void) } static void -check_qunit_data(void) +check_quota_body(void) { - BLANK_LINE(); - CHECK_STRUCT(qunit_data); - CHECK_MEMBER(qunit_data, qd_id); - CHECK_MEMBER(qunit_data, qd_flags); - CHECK_MEMBER(qunit_data, qd_count); - CHECK_MEMBER(qunit_data, qd_qunit); - CHECK_MEMBER(qunit_data, padding); + BLANK_LINE(); + CHECK_STRUCT(quota_body); + CHECK_MEMBER(quota_body, qb_fid); + CHECK_MEMBER(quota_body, qb_id); + CHECK_MEMBER(quota_body, qb_flags); + CHECK_MEMBER(quota_body, qb_padding); + CHECK_MEMBER(quota_body, qb_count); + CHECK_MEMBER(quota_body, qb_usage); + CHECK_MEMBER(quota_body, qb_slv_ver); + CHECK_MEMBER(quota_body, qb_lockh); + CHECK_MEMBER(quota_body, qb_glb_lockh); + CHECK_MEMBER(quota_body, qb_padding1[4]); } static void @@ -1667,18 +1744,6 @@ check_posix_acl_xattr_header(void) } static void -check_quota_adjust_qunit(void) -{ - BLANK_LINE(); - CHECK_STRUCT(quota_adjust_qunit); - CHECK_MEMBER(quota_adjust_qunit, qaq_flags); - CHECK_MEMBER(quota_adjust_qunit, qaq_id); - CHECK_MEMBER(quota_adjust_qunit, qaq_bunit_sz); - CHECK_MEMBER(quota_adjust_qunit, qaq_iunit_sz); - CHECK_MEMBER(quota_adjust_qunit, padding1); -} - -static void check_ll_user_fiemap(void) { BLANK_LINE(); @@ -1946,16 +2011,6 @@ main(int argc, char **argv) CHECK_VALUE_X(MF_SOM_AU); CHECK_VALUE_X(MF_GETATTR_LOCK); - CHECK_VALUE(LQUOTA_FLAGS_GRP); - CHECK_VALUE(LQUOTA_FLAGS_BLK); - CHECK_VALUE(LQUOTA_FLAGS_ADJBLK); - CHECK_VALUE(LQUOTA_FLAGS_ADJINO); - CHECK_VALUE(LQUOTA_FLAGS_CHG_QS); - CHECK_VALUE(LQUOTA_FLAGS_RECOVERY); - CHECK_VALUE(LQUOTA_FLAGS_SETQUOTA); - - CHECK_VALUE_X(LQUOTA_QAQ_CREATE_LQS); - CHECK_VALUE_64X(MDS_ATTR_MODE); CHECK_VALUE_64X(MDS_ATTR_UID); CHECK_VALUE_64X(MDS_ATTR_GID); @@ -2014,11 +2069,20 @@ main(int argc, char **argv) CHECK_CVALUE(LUSTRE_RES_ID_SEQ_OFF); CHECK_CVALUE(LUSTRE_RES_ID_VER_OID_OFF); /* CHECK_CVALUE(LUSTRE_RES_ID_WAS_VER_OFF); packed with OID */ + CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_SEQ_OFF); + CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_VER_OID_OFF); CHECK_CVALUE(LUSTRE_RES_ID_HSH_OFF); + CHECK_CVALUE(LQUOTA_TYPE_USR); + CHECK_CVALUE(LQUOTA_TYPE_GRP); + + CHECK_CVALUE(LQUOTA_RES_MD); + 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); CHECK_VALUE(QUOTA_DQACQ); @@ -2058,6 +2122,7 @@ main(int argc, char **argv) check_obd_statfs(); check_obd_ioobj(); check_obd_quotactl(); + check_obd_idx_read(); check_niobuf_remote(); check_ost_body(); check_ll_fid(); @@ -2083,7 +2148,9 @@ main(int argc, char **argv) check_ldlm_lock_desc(); check_ldlm_request(); check_ldlm_reply(); - check_ldlm_lvb(); + check_ldlm_ost_lvb(); + check_ldlm_lquota_lvb(); + check_ldlm_gl_lquota_desc(); check_mgs_send_param(); check_cfg_marker(); check_llog_logid(); @@ -2107,8 +2174,7 @@ main(int argc, char **argv) check_llogd_body(); check_llogd_conn_body(); check_ll_fiemap_info_key(); - check_qunit_data(); - check_quota_adjust_qunit(); + check_quota_body(); check_mgs_target_info(); check_lustre_capa(); check_lustre_capa_key();