X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fwirecheck.c;h=d88843914980c2c23800bbc2f5f37e0e407d3b25;hb=4f91d5161d005eed6ff7a9fe6abea99690f4bcb7;hp=e61faef462de58faa21c6ac7aeacc58982f68ad6;hpb=20aee71e3b66eb183cddef7a018887078027b815;p=fs%2Flustre-release.git

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index e61faef..d888439 100644
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -28,9 +28,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -378,8 +377,10 @@ check_obd_connect_data(void)
         CHECK_MEMBER(obd_connect_data, ocd_index);
         CHECK_MEMBER(obd_connect_data, ocd_brw_size);
         CHECK_MEMBER(obd_connect_data, ocd_ibits_known);
-        CHECK_MEMBER(obd_connect_data, ocd_nllu);
-        CHECK_MEMBER(obd_connect_data, ocd_nllg);
+        CHECK_MEMBER(obd_connect_data, ocd_blocksize);
+        CHECK_MEMBER(obd_connect_data, ocd_inodespace);
+        CHECK_MEMBER(obd_connect_data, ocd_grant_extent);
+        CHECK_MEMBER(obd_connect_data, ocd_unused);
         CHECK_MEMBER(obd_connect_data, ocd_transno);
         CHECK_MEMBER(obd_connect_data, ocd_group);
         CHECK_MEMBER(obd_connect_data, ocd_cksum_types);
@@ -443,6 +444,9 @@ check_obd_connect_data(void)
         CHECK_DEFINE_64X(OBD_CONNECT_64BITHASH);
         CHECK_DEFINE_64X(OBD_CONNECT_MAXBYTES);
         CHECK_DEFINE_64X(OBD_CONNECT_IMP_RECOV);
+        CHECK_DEFINE_64X(OBD_CONNECT_JOBSTATS);
+        CHECK_DEFINE_64X(OBD_CONNECT_GRANT_PARAM);
+        CHECK_DEFINE_64X(OBD_CONNECT_EINPROGRESS);
 
         CHECK_VALUE_X(OBD_CKSUM_CRC32);
         CHECK_VALUE_X(OBD_CKSUM_ADLER);
@@ -479,7 +483,7 @@ check_obdo(void)
         CHECK_MEMBER(obdo, o_lcookie);
         CHECK_MEMBER(obdo, o_uid_h);
         CHECK_MEMBER(obdo, o_gid_h);
-        CHECK_MEMBER(obdo, o_padding_3);
+        CHECK_MEMBER(obdo, o_data_version);
         CHECK_MEMBER(obdo, o_padding_4);
         CHECK_MEMBER(obdo, o_padding_5);
         CHECK_MEMBER(obdo, o_padding_6);
@@ -531,6 +535,7 @@ check_obdo(void)
         CHECK_DEFINE_64X(OBD_MD_FLRMTLGETFACL);
         CHECK_DEFINE_64X(OBD_MD_FLRMTRSETFACL);
         CHECK_DEFINE_64X(OBD_MD_FLRMTRGETFACL);
+        CHECK_DEFINE_64X(OBD_MD_FLDATAVERSION);
 
         CHECK_CVALUE_X(OBD_FL_INLINEDATA);
         CHECK_CVALUE_X(OBD_FL_OBDMDEXISTS);
@@ -786,15 +791,16 @@ check_mdt_body(void)
 
         /* these should be identical to their EXT3_*_FL counterparts, and
          * are redefined only to avoid dragging in ext3_fs.h */
-        CHECK_DEFINE_X(MDS_SYNC_FL);
-        CHECK_DEFINE_X(MDS_IMMUTABLE_FL);
-        CHECK_DEFINE_X(MDS_APPEND_FL);
-        CHECK_DEFINE_X(MDS_NOATIME_FL);
-        CHECK_DEFINE_X(MDS_DIRSYNC_FL);
+        CHECK_DEFINE_X(LUSTRE_SYNC_FL);
+        CHECK_DEFINE_X(LUSTRE_IMMUTABLE_FL);
+        CHECK_DEFINE_X(LUSTRE_APPEND_FL);
+        CHECK_DEFINE_X(LUSTRE_NOATIME_FL);
+        CHECK_DEFINE_X(LUSTRE_DIRSYNC_FL);
 
         CHECK_DEFINE_X(MDS_INODELOCK_LOOKUP);
         CHECK_DEFINE_X(MDS_INODELOCK_UPDATE);
         CHECK_DEFINE_X(MDS_INODELOCK_OPEN);
+        CHECK_DEFINE_X(MDS_INODELOCK_LAYOUT);
 }
 
 static void
@@ -1886,7 +1892,7 @@ main(int argc, char **argv)
         CHECK_VALUE(MDS_STATUS_CONN);
         CHECK_VALUE(MDS_STATUS_LOV);
 
-        CHECK_VALUE(MDS_BFLAG_UNCOMMITTED_WRITES);
+        CHECK_VALUE(LUSTRE_BFLAG_UNCOMMITTED_WRITES);
 
         CHECK_VALUE_X(MF_SOM_CHANGE);
         CHECK_VALUE_X(MF_EPOCH_OPEN);
@@ -1963,6 +1969,11 @@ main(int argc, char **argv)
         CHECK_CVALUE(LDLM_IBITS);
         CHECK_CVALUE(LDLM_MAX_TYPE);
 
+        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_HSH_OFF);
+
         CHECK_VALUE(OBD_PING);
         CHECK_VALUE(OBD_LOG_CANCEL);
         CHECK_VALUE(OBD_QC_CALLBACK);