X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=5ea06e7513622e89bb6e41591ba57ba5a031295e;hb=0517160dd68ac026513ad1b8e3e6f7abd4acfdef;hp=2f9188683cfe76bbe4ba8caaebe02ffcf9237c63;hpb=30dda5e616718499f54d06a7e3723dea4c4a7e79;p=fs%2Flustre-release.git diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 2f91886..5ea06e7 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -26,10 +26,13 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. */ /* + * Copyright (c) 2011 Whamcloud, Inc. + */ +/* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ @@ -190,20 +193,24 @@ static void check_obd_connect_data(void) CHECK_MEMBER(obd_connect_data, ocd_transno); CHECK_MEMBER(obd_connect_data, ocd_group); CHECK_MEMBER(obd_connect_data, ocd_cksum_types); + CHECK_MEMBER(obd_connect_data, ocd_max_easize); + CHECK_MEMBER(obd_connect_data, padding); + CHECK_MEMBER(obd_connect_data, ocd_maxbytes); CHECK_MEMBER(obd_connect_data, padding1); CHECK_MEMBER(obd_connect_data, padding2); CHECK_CDEFINE(OBD_CONNECT_RDONLY); CHECK_CDEFINE(OBD_CONNECT_INDEX); + CHECK_CDEFINE(OBD_CONNECT_MDS); CHECK_CDEFINE(OBD_CONNECT_GRANT); CHECK_CDEFINE(OBD_CONNECT_SRVLOCK); CHECK_CDEFINE(OBD_CONNECT_VERSION); CHECK_CDEFINE(OBD_CONNECT_REQPORTAL); CHECK_CDEFINE(OBD_CONNECT_ACL); CHECK_CDEFINE(OBD_CONNECT_XATTR); - CHECK_CDEFINE(OBD_CONNECT_REAL); - CHECK_CDEFINE(OBD_CONNECT_CKSUM); + CHECK_CDEFINE(OBD_CONNECT_CROW); CHECK_CDEFINE(OBD_CONNECT_TRUNCLOCK); + CHECK_CDEFINE(OBD_CONNECT_TRANSNO); CHECK_CDEFINE(OBD_CONNECT_IBITS); CHECK_CDEFINE(OBD_CONNECT_JOIN); CHECK_CDEFINE(OBD_CONNECT_ATTRFID); @@ -214,14 +221,24 @@ static void check_obd_connect_data(void) CHECK_CDEFINE(OBD_CONNECT_QUOTA64); CHECK_CDEFINE(OBD_CONNECT_MDS_CAPA); CHECK_CDEFINE(OBD_CONNECT_OSS_CAPA); - CHECK_CDEFINE(OBD_CONNECT_MDS_MDS); + CHECK_CDEFINE(OBD_CONNECT_CANCELSET); CHECK_CDEFINE(OBD_CONNECT_SOM); CHECK_CDEFINE(OBD_CONNECT_AT); - CHECK_CDEFINE(OBD_CONNECT_CANCELSET); CHECK_CDEFINE(OBD_CONNECT_LRU_RESIZE); + CHECK_CDEFINE(OBD_CONNECT_MDS_MDS); + CHECK_CDEFINE(OBD_CONNECT_REAL); + CHECK_CDEFINE(OBD_CONNECT_CHANGE_QS); + CHECK_CDEFINE(OBD_CONNECT_CKSUM); + CHECK_CDEFINE(OBD_CONNECT_FID); CHECK_CDEFINE(OBD_CONNECT_VBR); + CHECK_CDEFINE(OBD_CONNECT_LOV_V3); + CHECK_CDEFINE(OBD_CONNECT_GRANT_SHRINK); CHECK_CDEFINE(OBD_CONNECT_SKIP_ORPHAN); + CHECK_CDEFINE(OBD_CONNECT_MAX_EASIZE); CHECK_CDEFINE(OBD_CONNECT_FULL20); + CHECK_CDEFINE(OBD_CONNECT_LAYOUTLOCK); + CHECK_CDEFINE(OBD_CONNECT_64BITHASH); + CHECK_CDEFINE(OBD_CONNECT_MAXBYTES); } static void @@ -231,8 +248,8 @@ check_obdo(void) CHECK_STRUCT(obdo); CHECK_MEMBER(obdo, o_valid); CHECK_MEMBER(obdo, o_id); - CHECK_MEMBER(obdo, o_gr); - CHECK_MEMBER(obdo, o_fid); + CHECK_MEMBER(obdo, o_seq); + CHECK_MEMBER(obdo, o_parent_seq); CHECK_MEMBER(obdo, o_size); CHECK_MEMBER(obdo, o_mtime); CHECK_MEMBER(obdo, o_atime); @@ -245,14 +262,15 @@ check_obdo(void) CHECK_MEMBER(obdo, o_gid); CHECK_MEMBER(obdo, o_flags); CHECK_MEMBER(obdo, o_nlink); - CHECK_MEMBER(obdo, o_generation); + CHECK_MEMBER(obdo, o_parent_oid); CHECK_MEMBER(obdo, o_misc); CHECK_MEMBER(obdo, o_ioepoch); CHECK_MEMBER(obdo, o_stripe_idx); - CHECK_MEMBER(obdo, o_padding_1); + CHECK_MEMBER(obdo, o_parent_ver); CHECK_MEMBER(obdo, o_handle); CHECK_MEMBER(obdo, o_lcookie); - CHECK_MEMBER(obdo, o_padding_2); + CHECK_MEMBER(obdo, o_uid_h); + CHECK_MEMBER(obdo, o_gid_h); CHECK_MEMBER(obdo, o_padding_3); CHECK_MEMBER(obdo, o_padding_4); CHECK_MEMBER(obdo, o_padding_5); @@ -306,9 +324,13 @@ check_obdo(void) CHECK_CVALUE(OBD_FL_SRVLOCK); CHECK_CVALUE(OBD_FL_CKSUM_CRC32); CHECK_CVALUE(OBD_FL_CKSUM_ADLER); + CHECK_CVALUE(OBD_FL_CKSUM_CRC32C); CHECK_CVALUE(OBD_FL_SHRINK_GRANT); + CHECK_CVALUE(OBD_FL_MMAP); + CHECK_CVALUE(OBD_FL_RECOV_RESEND); CHECK_CVALUE(OBD_CKSUM_CRC32); CHECK_CVALUE(OBD_CKSUM_ADLER); + CHECK_CVALUE(OBD_CKSUM_CRC32C); } static void @@ -319,7 +341,7 @@ check_lov_mds_md_v1(void) CHECK_MEMBER(lov_mds_md_v1, lmm_magic); CHECK_MEMBER(lov_mds_md_v1, lmm_pattern); CHECK_MEMBER(lov_mds_md_v1, lmm_object_id); - CHECK_MEMBER(lov_mds_md_v1, lmm_object_gr); + CHECK_MEMBER(lov_mds_md_v1, lmm_object_seq); CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_size); CHECK_MEMBER(lov_mds_md_v1, lmm_stripe_count); CHECK_MEMBER(lov_mds_md_v1, lmm_objects); @@ -327,7 +349,7 @@ check_lov_mds_md_v1(void) BLANK_LINE(); CHECK_STRUCT(lov_ost_data_v1); CHECK_MEMBER(lov_ost_data_v1, l_object_id); - CHECK_MEMBER(lov_ost_data_v1, l_object_gr); + CHECK_MEMBER(lov_ost_data_v1, l_object_seq); CHECK_MEMBER(lov_ost_data_v1, l_ost_gen); CHECK_MEMBER(lov_ost_data_v1, l_ost_idx); @@ -345,7 +367,7 @@ check_lov_mds_md_v3(void) CHECK_MEMBER(lov_mds_md_v3, lmm_magic); CHECK_MEMBER(lov_mds_md_v3, lmm_pattern); CHECK_MEMBER(lov_mds_md_v3, lmm_object_id); - CHECK_MEMBER(lov_mds_md_v3, lmm_object_gr); + CHECK_MEMBER(lov_mds_md_v3, lmm_object_seq); CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_size); CHECK_MEMBER(lov_mds_md_v3, lmm_stripe_count); CHECK_MEMBER(lov_mds_md_v3, lmm_pool_name); @@ -354,7 +376,7 @@ check_lov_mds_md_v3(void) BLANK_LINE(); CHECK_STRUCT(lov_ost_data_v1); CHECK_MEMBER(lov_ost_data_v1, l_object_id); - CHECK_MEMBER(lov_ost_data_v1, l_object_gr); + CHECK_MEMBER(lov_ost_data_v1, l_object_seq); CHECK_MEMBER(lov_ost_data_v1, l_ost_gen); CHECK_MEMBER(lov_ost_data_v1, l_ost_idx); @@ -395,7 +417,7 @@ check_obd_ioobj(void) BLANK_LINE(); CHECK_STRUCT(obd_ioobj); CHECK_MEMBER(obd_ioobj, ioo_id); - CHECK_MEMBER(obd_ioobj, ioo_gr); + CHECK_MEMBER(obd_ioobj, ioo_seq); CHECK_MEMBER(obd_ioobj, ioo_type); CHECK_MEMBER(obd_ioobj, ioo_bufcnt); } @@ -599,8 +621,8 @@ check_mdt_rec_create(void) CHECK_MEMBER(mdt_rec_create, cr_padding_1); CHECK_MEMBER(mdt_rec_create, cr_mode); CHECK_MEMBER(mdt_rec_create, cr_bias); - CHECK_MEMBER(mdt_rec_create, cr_flags); - CHECK_MEMBER(mdt_rec_create, cr_padding_2); + CHECK_MEMBER(mdt_rec_create, cr_flags_l); + CHECK_MEMBER(mdt_rec_create, cr_flags_h); CHECK_MEMBER(mdt_rec_create, cr_padding_3); CHECK_MEMBER(mdt_rec_create, cr_padding_4); } @@ -686,7 +708,7 @@ check_mdt_rec_rename(void) CHECK_MEMBER(mdt_rec_rename, rn_padding_1); CHECK_MEMBER(mdt_rec_rename, rn_padding_2); CHECK_MEMBER(mdt_rec_rename, rn_padding_3); - CHECK_MEMBER(mdt_rec_rename, rn_padding_4); + CHECK_MEMBER(mdt_rec_rename, rn_padding_4); CHECK_MEMBER(mdt_rec_rename, rn_bias); CHECK_MEMBER(mdt_rec_rename, rn_mode); CHECK_MEMBER(mdt_rec_rename, rn_padding_5); @@ -742,11 +764,11 @@ static void check_ldlm_flock(void) { BLANK_LINE(); - CHECK_STRUCT(ldlm_flock); - CHECK_MEMBER(ldlm_flock, start); - CHECK_MEMBER(ldlm_flock, end); - CHECK_MEMBER(ldlm_flock, blocking_pid); - CHECK_MEMBER(ldlm_flock, pid); + CHECK_STRUCT(ldlm_flock_wire); + CHECK_MEMBER(ldlm_flock_wire, lfw_start); + CHECK_MEMBER(ldlm_flock_wire, lfw_end); + CHECK_MEMBER(ldlm_flock_wire, lfw_owner); + CHECK_MEMBER(ldlm_flock_wire, lfw_pid); } static void @@ -834,7 +856,7 @@ check_llog_logid(void) BLANK_LINE(); CHECK_STRUCT(llog_logid); CHECK_MEMBER(llog_logid, lgl_oid); - CHECK_MEMBER(llog_logid, lgl_ogr); + CHECK_MEMBER(llog_logid, lgl_oseq); CHECK_MEMBER(llog_logid, lgl_ogen); CHECK_CVALUE(OST_SZ_REC); @@ -903,8 +925,9 @@ check_llog_create_rec(void) CHECK_MEMBER(llog_create_rec, lcr_hdr); CHECK_MEMBER(llog_create_rec, lcr_fid); CHECK_MEMBER(llog_create_rec, lcr_oid); - CHECK_MEMBER(llog_create_rec, lcr_ogr); + CHECK_MEMBER(llog_create_rec, lcr_oseq); CHECK_MEMBER(llog_create_rec, padding); + CHECK_MEMBER(llog_create_rec, lcr_tail); } static void @@ -926,7 +949,7 @@ check_llog_unlink_rec(void) CHECK_STRUCT(llog_unlink_rec); CHECK_MEMBER(llog_unlink_rec, lur_hdr); CHECK_MEMBER(llog_unlink_rec, lur_oid); - CHECK_MEMBER(llog_unlink_rec, lur_ogr); + CHECK_MEMBER(llog_unlink_rec, lur_oseq); CHECK_MEMBER(llog_unlink_rec, lur_count); CHECK_MEMBER(llog_unlink_rec, lur_tail); } @@ -938,7 +961,7 @@ check_llog_setattr_rec(void) CHECK_STRUCT(llog_setattr_rec); CHECK_MEMBER(llog_setattr_rec, lsr_hdr); CHECK_MEMBER(llog_setattr_rec, lsr_oid); - CHECK_MEMBER(llog_setattr_rec, lsr_ogr); + CHECK_MEMBER(llog_setattr_rec, lsr_oseq); CHECK_MEMBER(llog_setattr_rec, lsr_uid); CHECK_MEMBER(llog_setattr_rec, lsr_gid); CHECK_MEMBER(llog_setattr_rec, padding); @@ -952,7 +975,7 @@ check_llog_setattr64_rec(void) CHECK_STRUCT(llog_setattr64_rec); CHECK_MEMBER(llog_setattr64_rec, lsr_hdr); CHECK_MEMBER(llog_setattr64_rec, lsr_oid); - CHECK_MEMBER(llog_setattr64_rec, lsr_ogr); + CHECK_MEMBER(llog_setattr64_rec, lsr_oseq); CHECK_MEMBER(llog_setattr64_rec, padding); CHECK_MEMBER(llog_setattr64_rec, lsr_uid); CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h); @@ -1226,6 +1249,37 @@ check_link_ea_entry(void) CHECK_MEMBER(link_ea_entry, lee_name); } +static void +check_hsm_user_item(void) +{ + BLANK_LINE(); + CHECK_STRUCT(hsm_user_item); + CHECK_MEMBER(hsm_user_item, hui_fid); + CHECK_MEMBER(hsm_user_item, hui_extent); +} + +static void +check_hsm_user_request(void) +{ + BLANK_LINE(); + CHECK_STRUCT(hsm_user_request); + CHECK_MEMBER(hsm_user_request, hur_action); + CHECK_MEMBER(hsm_user_request, hur_archive_num); + CHECK_MEMBER(hsm_user_request, hur_itemcount); + CHECK_MEMBER(hsm_user_request, hur_data_len); +} + +static void +check_hsm_user_state(void) +{ + BLANK_LINE(); + CHECK_STRUCT(hsm_user_state); + CHECK_MEMBER(hsm_user_state, hus_states); + CHECK_MEMBER(hsm_user_state, hus_archive_num); + CHECK_MEMBER(hsm_user_state, hus_in_progress_state); + CHECK_MEMBER(hsm_user_state, hus_in_progress_action); + CHECK_MEMBER(hsm_user_state, hus_in_progress_location); +} static void system_string (char *cmdline, char *str, int len) @@ -1423,6 +1477,10 @@ main(int argc, char **argv) CHECK_VALUE(MGS_TARGET_DEL); CHECK_VALUE(MGS_SET_INFO); + CHECK_VALUE(LDF_EMPTY); + CHECK_VALUE(LDF_COLLIDE); + CHECK_VALUE(LU_PAGE_SIZE); + COMMENT("Sizes and Offsets"); BLANK_LINE(); CHECK_STRUCT(obd_uuid); @@ -1492,6 +1550,9 @@ main(int argc, char **argv) printf("#endif\n"); check_link_ea_header(); check_link_ea_entry(); + check_hsm_user_item(); + check_hsm_user_request(); + check_hsm_user_state(); printf("}\n\n");