X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=89f2ec090ec815edce9b7f9e809b3eb33977366f;hp=e1ca25eb6ec2816cc3f346739882b6fad0c07667;hb=9d4b898b1c1c7c318fda5f0c345ed726c774c06a;hpb=d7ac09b712ce9dc444ac5dc6ff350700cccf6564 diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index e1ca25e..89f2ec0 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -36,7 +36,7 @@ do { \ #define CHECK_MEMBER_OFFSET(s,m) \ do { \ - CHECK_VALUE(offsetof(struct s, m)); \ + CHECK_VALUE((int)offsetof(struct s, m)); \ } while(0) #define CHECK_MEMBER_SIZEOF(s,m) \ @@ -116,6 +116,9 @@ check_obdo(void) CHECK_MEMBER(obdo, o_valid); CHECK_MEMBER(obdo, o_misc); CHECK_MEMBER(obdo, o_easize); + CHECK_MEMBER(obdo, o_mds); + CHECK_MEMBER(obdo, o_mds); + CHECK_MEMBER(obdo, o_padding); CHECK_MEMBER(obdo, o_inline); CHECK_VALUE(OBD_MD_FLID); @@ -229,13 +232,13 @@ check_ost_body(void) } void -check_ll_fid(void) +check_lustre_stc(void) { BLANK_LINE(); - CHECK_STRUCT(ll_fid); - CHECK_MEMBER(ll_fid, id); - CHECK_MEMBER(ll_fid, generation); - CHECK_MEMBER(ll_fid, f_type); + CHECK_STRUCT(lustre_stc); + CHECK_MEMBER(lustre_stc, u.e3s.l3s_ino); + CHECK_MEMBER(lustre_stc, u.e3s.l3s_gen); + CHECK_MEMBER(lustre_stc, u.e3s.l3s_type); } void @@ -252,17 +255,13 @@ check_mds_body(void) { BLANK_LINE(); CHECK_STRUCT(mds_body); - CHECK_MEMBER(mds_body, fid1); - CHECK_MEMBER(mds_body, fid2); + CHECK_MEMBER(mds_body, id1); + CHECK_MEMBER(mds_body, id2); CHECK_MEMBER(mds_body, handle); CHECK_MEMBER(mds_body, size); CHECK_MEMBER(mds_body, blocks); CHECK_MEMBER(mds_body, io_epoch); - CHECK_MEMBER(mds_body, ino); CHECK_MEMBER(mds_body, valid); - CHECK_MEMBER(mds_body, fsuid); - CHECK_MEMBER(mds_body, fsgid); - CHECK_MEMBER(mds_body, capability); CHECK_MEMBER(mds_body, mode); CHECK_MEMBER(mds_body, uid); CHECK_MEMBER(mds_body, gid); @@ -272,8 +271,6 @@ check_mds_body(void) CHECK_MEMBER(mds_body, flags); CHECK_MEMBER(mds_body, rdev); CHECK_MEMBER(mds_body, nlink); - CHECK_MEMBER(mds_body, generation); - CHECK_MEMBER(mds_body, suppgid); CHECK_MEMBER(mds_body, eadatasize); CHECK_VALUE(FMODE_READ); @@ -295,12 +292,8 @@ check_mds_rec_setattr(void) BLANK_LINE(); CHECK_STRUCT(mds_rec_setattr); CHECK_MEMBER(mds_rec_setattr, sa_opcode); - CHECK_MEMBER(mds_rec_setattr, sa_fsuid); - CHECK_MEMBER(mds_rec_setattr, sa_fsgid); - CHECK_MEMBER(mds_rec_setattr, sa_cap); - CHECK_MEMBER(mds_rec_setattr, sa_suppgid); CHECK_MEMBER(mds_rec_setattr, sa_valid); - CHECK_MEMBER(mds_rec_setattr, sa_fid); + CHECK_MEMBER(mds_rec_setattr, sa_id); CHECK_MEMBER(mds_rec_setattr, sa_mode); CHECK_MEMBER(mds_rec_setattr, sa_uid); CHECK_MEMBER(mds_rec_setattr, sa_gid); @@ -317,16 +310,13 @@ check_mds_rec_create(void) BLANK_LINE(); CHECK_STRUCT(mds_rec_create); CHECK_MEMBER(mds_rec_create, cr_opcode); - CHECK_MEMBER(mds_rec_create, cr_fsuid); - CHECK_MEMBER(mds_rec_create, cr_fsgid); - CHECK_MEMBER(mds_rec_create, cr_cap); CHECK_MEMBER(mds_rec_create, cr_flags); CHECK_MEMBER(mds_rec_create, cr_mode); - CHECK_MEMBER(mds_rec_create, cr_fid); - CHECK_MEMBER(mds_rec_create, cr_replayfid); + CHECK_MEMBER(mds_rec_create, cr_padding); + CHECK_MEMBER(mds_rec_create, cr_id); + CHECK_MEMBER(mds_rec_create, cr_replayid); CHECK_MEMBER(mds_rec_create, cr_time); CHECK_MEMBER(mds_rec_create, cr_rdev); - CHECK_MEMBER(mds_rec_create, cr_suppgid); } void @@ -335,13 +325,9 @@ check_mds_rec_link(void) BLANK_LINE(); CHECK_STRUCT(mds_rec_link); CHECK_MEMBER(mds_rec_link, lk_opcode); - CHECK_MEMBER(mds_rec_link, lk_fsuid); - CHECK_MEMBER(mds_rec_link, lk_fsgid); - CHECK_MEMBER(mds_rec_link, lk_cap); - CHECK_MEMBER(mds_rec_link, lk_suppgid1); - CHECK_MEMBER(mds_rec_link, lk_suppgid2); - CHECK_MEMBER(mds_rec_link, lk_fid1); - CHECK_MEMBER(mds_rec_link, lk_fid2); + CHECK_MEMBER(mds_rec_link, lk_padding); + CHECK_MEMBER(mds_rec_link, lk_id1); + CHECK_MEMBER(mds_rec_link, lk_id2); CHECK_MEMBER(mds_rec_link, lk_time); } @@ -351,13 +337,9 @@ check_mds_rec_unlink(void) BLANK_LINE(); CHECK_STRUCT(mds_rec_unlink); CHECK_MEMBER(mds_rec_unlink, ul_opcode); - CHECK_MEMBER(mds_rec_unlink, ul_fsuid); - CHECK_MEMBER(mds_rec_unlink, ul_fsgid); - CHECK_MEMBER(mds_rec_unlink, ul_cap); - CHECK_MEMBER(mds_rec_unlink, ul_suppgid); CHECK_MEMBER(mds_rec_unlink, ul_mode); - CHECK_MEMBER(mds_rec_unlink, ul_fid1); - CHECK_MEMBER(mds_rec_unlink, ul_fid2); + CHECK_MEMBER(mds_rec_unlink, ul_id1); + CHECK_MEMBER(mds_rec_unlink, ul_id2); CHECK_MEMBER(mds_rec_unlink, ul_time); } @@ -367,13 +349,9 @@ check_mds_rec_rename(void) BLANK_LINE(); CHECK_STRUCT(mds_rec_rename); CHECK_MEMBER(mds_rec_rename, rn_opcode); - CHECK_MEMBER(mds_rec_rename, rn_fsuid); - CHECK_MEMBER(mds_rec_rename, rn_fsgid); - CHECK_MEMBER(mds_rec_rename, rn_cap); - CHECK_MEMBER(mds_rec_rename, rn_suppgid1); - CHECK_MEMBER(mds_rec_rename, rn_suppgid2); - CHECK_MEMBER(mds_rec_rename, rn_fid1); - CHECK_MEMBER(mds_rec_rename, rn_fid2); + CHECK_MEMBER(mds_rec_rename, rn_padding); + CHECK_MEMBER(mds_rec_rename, rn_id1); + CHECK_MEMBER(mds_rec_rename, rn_id2); CHECK_MEMBER(mds_rec_rename, rn_time); } @@ -578,7 +556,7 @@ check_llog_create_rec(void) BLANK_LINE(); CHECK_STRUCT(llog_create_rec); CHECK_MEMBER(llog_create_rec, lcr_hdr); - CHECK_MEMBER(llog_create_rec, lcr_fid); + CHECK_MEMBER(llog_create_rec, lcr_id); CHECK_MEMBER(llog_create_rec, lcr_oid); CHECK_MEMBER(llog_create_rec, lcr_ogen); } @@ -611,7 +589,7 @@ check_llog_size_change_rec(void) BLANK_LINE(); CHECK_STRUCT(llog_size_change_rec); CHECK_MEMBER(llog_size_change_rec, lsc_hdr); - CHECK_MEMBER(llog_size_change_rec, lsc_fid); + CHECK_MEMBER(llog_size_change_rec, lsc_id); CHECK_MEMBER(llog_size_change_rec, lsc_io_epoch); CHECK_MEMBER(llog_size_change_rec, lsc_tail); } @@ -648,7 +626,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); } @@ -676,7 +653,7 @@ check_llogd_body(void) CHECK_MEMBER(llogd_body, lgd_len); CHECK_MEMBER(llogd_body, lgd_cur_offset); - CHECK_VALUE(LLOG_ORIGIN_HANDLE_CREATE); + CHECK_VALUE(LLOG_ORIGIN_HANDLE_OPEN); CHECK_VALUE(LLOG_ORIGIN_HANDLE_NEXT_BLOCK); CHECK_VALUE(LLOG_ORIGIN_HANDLE_READ_HEADER); CHECK_VALUE(LLOG_ORIGIN_HANDLE_WRITE_REC); @@ -804,7 +781,7 @@ main(int argc, char **argv) CHECK_VALUE(OST_REQ_HAS_OA1); CHECK_VALUE(MDS_GETATTR); - CHECK_VALUE(MDS_GETATTR_NAME); + CHECK_VALUE(MDS_GETATTR_LOCK); CHECK_VALUE(MDS_CLOSE); CHECK_VALUE(MDS_REINT); CHECK_VALUE(MDS_READPAGE); @@ -878,7 +855,7 @@ main(int argc, char **argv) check_obd_ioobj(); check_niobuf_remote(); check_ost_body(); - check_ll_fid(); + check_lustre_stc(); check_mds_status_req(); check_mds_body(); check_mds_rec_setattr();