X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=1ac48abf8eceed9ed81054622485ae2ffd7c1ee3;hp=66d3cf313eeb05b09eee92eaae0e40fa52a5e403;hb=5bd85b467a4b6ef57d7a3c119296c9a317afc73b;hpb=0f8b7f951e7f43dbf389a431afea2091388a805e diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index 66d3cf3..1ac48ab 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, 2012, Intel Corporation. + * Copyright (c) 2011, 2013, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -206,11 +206,12 @@ 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_MEMBER(lustre_mdt_attrs, lma_flags); 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 @@ -242,8 +243,7 @@ check_ost_id(void) { BLANK_LINE(); CHECK_STRUCT(ost_id); - CHECK_MEMBER(ost_id, oi_id); - CHECK_MEMBER(ost_id, oi_seq); + CHECK_MEMBER(ost_id, oi); CHECK_VALUE(LUSTRE_FID_INIT_OID); @@ -263,6 +263,7 @@ check_ost_id(void) CHECK_VALUE_64X(FID_SEQ_SPECIAL); CHECK_VALUE_64X(FID_SEQ_QUOTA); CHECK_VALUE_64X(FID_SEQ_QUOTA_GLB); + CHECK_VALUE_64X(FID_SEQ_ROOT); CHECK_VALUE_64X(FID_SEQ_NORMAL); CHECK_VALUE_64X(FID_SEQ_LOV_DEFAULT); @@ -520,6 +521,8 @@ check_obd_connect_data(void) CHECK_DEFINE_64X(OBD_CONNECT_NANOSEC_TIME); CHECK_DEFINE_64X(OBD_CONNECT_LIGHTWEIGHT); CHECK_DEFINE_64X(OBD_CONNECT_SHORTIO); + CHECK_DEFINE_64X(OBD_CONNECT_PINGLESS); + CHECK_DEFINE_64X(OBD_CONNECT_FLOCK_DEAD); CHECK_VALUE_X(OBD_CKSUM_CRC32); CHECK_VALUE_X(OBD_CKSUM_ADLER); @@ -532,8 +535,7 @@ check_obdo(void) BLANK_LINE(); CHECK_STRUCT(obdo); CHECK_MEMBER(obdo, o_valid); - CHECK_MEMBER(obdo, o_id); - CHECK_MEMBER(obdo, o_seq); + CHECK_MEMBER(obdo, o_oi); CHECK_MEMBER(obdo, o_parent_seq); CHECK_MEMBER(obdo, o_size); CHECK_MEMBER(obdo, o_mtime); @@ -593,6 +595,7 @@ check_obdo(void) 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); @@ -637,8 +640,7 @@ check_lov_ost_data_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_seq); + CHECK_MEMBER(lov_ost_data_v1, l_ost_oi); CHECK_MEMBER(lov_ost_data_v1, l_ost_gen); CHECK_MEMBER(lov_ost_data_v1, l_ost_idx); } @@ -650,8 +652,7 @@ check_lov_mds_md_v1(void) CHECK_STRUCT(lov_mds_md_v1); 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_seq); + CHECK_MEMBER(lov_mds_md_v1, lmm_oi); 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_layout_gen); @@ -667,8 +668,7 @@ check_lov_mds_md_v3(void) CHECK_STRUCT(lov_mds_md_v3); 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_seq); + CHECK_MEMBER(lov_mds_md_v3, lmm_oi); 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_layout_gen); @@ -714,8 +714,7 @@ check_obd_ioobj(void) { BLANK_LINE(); CHECK_STRUCT(obd_ioobj); - CHECK_MEMBER(obd_ioobj, ioo_id); - CHECK_MEMBER(obd_ioobj, ioo_seq); + CHECK_MEMBER(obd_ioobj, ioo_oid); CHECK_MEMBER(obd_ioobj, ioo_max_brw); CHECK_MEMBER(obd_ioobj, ioo_bufcnt); } @@ -875,7 +874,7 @@ check_mdt_body(void) CHECK_MEMBER(mdt_body, atime); CHECK_MEMBER(mdt_body, ctime); CHECK_MEMBER(mdt_body, blocks); - CHECK_MEMBER(mdt_body, unused1); + CHECK_MEMBER(mdt_body, t_state); CHECK_MEMBER(mdt_body, fsuid); CHECK_MEMBER(mdt_body, fsgid); CHECK_MEMBER(mdt_body, capability); @@ -1178,8 +1177,8 @@ check_mdt_rec_reint(void) CHECK_MEMBER(mdt_rec_reint, rr_bias); CHECK_MEMBER(mdt_rec_reint, rr_mode); CHECK_MEMBER(mdt_rec_reint, rr_flags); - CHECK_MEMBER(mdt_rec_reint, rr_padding_2); - CHECK_MEMBER(mdt_rec_reint, rr_padding_3); + CHECK_MEMBER(mdt_rec_reint, rr_flags_h); + CHECK_MEMBER(mdt_rec_reint, rr_umask); CHECK_MEMBER(mdt_rec_reint, rr_padding_4); } @@ -1412,8 +1411,7 @@ check_llog_logid(void) { BLANK_LINE(); CHECK_STRUCT(llog_logid); - CHECK_MEMBER(llog_logid, lgl_oid); - CHECK_MEMBER(llog_logid, lgl_oseq); + CHECK_MEMBER(llog_logid, lgl_oi); CHECK_MEMBER(llog_logid, lgl_ogen); CHECK_CVALUE(OST_SZ_REC); @@ -1503,8 +1501,7 @@ check_llog_setattr64_rec(void) BLANK_LINE(); 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_oseq); + CHECK_MEMBER(llog_setattr64_rec, lsr_oi); CHECK_MEMBER(llog_setattr64_rec, lsr_uid); CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h); CHECK_MEMBER(llog_setattr64_rec, lsr_gid); @@ -1955,8 +1952,7 @@ static void check_layout_intent(void) CHECK_VALUE(LAYOUT_INTENT_RESTORE); } -static void -check_hsm_state_set(void) +static void check_hsm_state_set(void) { BLANK_LINE(); CHECK_STRUCT(hsm_state_set); @@ -1966,8 +1962,7 @@ check_hsm_state_set(void) CHECK_MEMBER(hsm_state_set, hss_clearmask); } -static void -check_hsm_current_action(void) +static void check_hsm_current_action(void) { BLANK_LINE(); CHECK_STRUCT(hsm_current_action); @@ -1976,8 +1971,7 @@ check_hsm_current_action(void) CHECK_MEMBER(hsm_current_action, hca_location); } -static void -check_hsm_request(void) +static void check_hsm_request(void) { BLANK_LINE(); CHECK_STRUCT(hsm_request); @@ -1990,8 +1984,7 @@ check_hsm_request(void) CHECK_VALUE_X(HSM_GHOST_COPY); } -static void -check_hsm_user_request(void) +static void check_hsm_user_request(void) { BLANK_LINE(); CHECK_STRUCT(hsm_user_request); @@ -1999,6 +1992,21 @@ check_hsm_user_request(void) CHECK_MEMBER(hsm_user_request, hur_user_item); } +static void check_hsm_user_import(void) +{ + BLANK_LINE(); + CHECK_STRUCT(hsm_user_import); + CHECK_MEMBER(hsm_user_import, hui_size); + CHECK_MEMBER(hsm_user_import, hui_uid); + CHECK_MEMBER(hsm_user_import, hui_gid); + CHECK_MEMBER(hsm_user_import, hui_mode); + CHECK_MEMBER(hsm_user_import, hui_atime); + CHECK_MEMBER(hsm_user_import, hui_atime_ns); + CHECK_MEMBER(hsm_user_import, hui_mtime); + CHECK_MEMBER(hsm_user_import, hui_mtime_ns); + CHECK_MEMBER(hsm_user_import, hui_archive_id); +} + static void check_update_buf(void) { BLANK_LINE(); @@ -2022,7 +2030,7 @@ static void check_update(void) BLANK_LINE(); CHECK_STRUCT(update); CHECK_MEMBER(update, u_type); - CHECK_MEMBER(update, u_padding); + CHECK_MEMBER(update, u_batchid); CHECK_MEMBER(update, u_fid); CHECK_MEMBER(update, u_lens); CHECK_MEMBER(update, u_bufs); @@ -2416,6 +2424,7 @@ main(int argc, char **argv) check_hsm_current_action(); check_hsm_request(); check_hsm_user_request(); + check_hsm_user_import(); check_update_buf(); check_update_reply();