LU-3365 lmv: support DNE with HSM.

[fs/lustre-release.git] / lustre / utils / wirecheck.c

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 842e374..d49a433 100644 (file)
--- 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,7 +206,6 @@ 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);
@@ -242,8 +241,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 +261,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);
 
@@ -533,8 +532,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);
@@ -638,8 +636,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);
 }
@@ -651,8 +648,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);
@@ -668,8 +664,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);
@@ -715,8 +710,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);
 }
@@ -1179,8 +1173,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);
 }
 
@@ -1413,8 +1407,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);
@@ -1504,8 +1497,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);