Whamcloud - gitweb
LU-4961 lustre: remove liblustre.h and obd.h from userspace
[fs/lustre-release.git] / lustre / utils / wirecheck.c
index ea07f4e..f27f748 100644 (file)
@@ -37,8 +37,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <liblustre.h>
-#include <lustre_lib.h>
+#include <libcfs/libcfs.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_disk.h>
 
@@ -524,6 +523,7 @@ check_obd_connect_data(void)
        CHECK_DEFINE_64X(OBD_CONNECT_PINGLESS);
        CHECK_DEFINE_64X(OBD_CONNECT_FLOCK_DEAD);
        CHECK_DEFINE_64X(OBD_CONNECT_OPEN_BY_FID);
+       CHECK_DEFINE_64X(OBD_CONNECT_LFSCK);
 
        CHECK_VALUE_X(OBD_CKSUM_CRC32);
        CHECK_VALUE_X(OBD_CKSUM_ADLER);
@@ -1750,25 +1750,6 @@ check_getinfo_fid2path(void)
 }
 
 static void
-check_posix_acl_xattr_entry(void)
-{
-       BLANK_LINE();
-       CHECK_STRUCT_TYPEDEF(posix_acl_xattr_entry);
-       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_tag);
-       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_perm);
-       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_entry, e_id);
-}
-
-static void
-check_posix_acl_xattr_header(void)
-{
-       BLANK_LINE();
-       CHECK_STRUCT_TYPEDEF(posix_acl_xattr_header);
-       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_version);
-       CHECK_MEMBER_TYPEDEF(posix_acl_xattr_header, a_entries);
-}
-
-static void
 check_ll_user_fiemap(void)
 {
        BLANK_LINE();
@@ -1999,33 +1980,58 @@ static void check_hsm_user_import(void)
        CHECK_MEMBER(hsm_user_import, hui_archive_id);
 }
 
-static void check_update_buf(void)
+static void check_object_update_param(void)
 {
        BLANK_LINE();
-       CHECK_STRUCT(update_buf);
-       CHECK_MEMBER(update_buf, ub_magic);
-       CHECK_MEMBER(update_buf, ub_count);
-       CHECK_MEMBER(update_buf, ub_bufs);
+       CHECK_STRUCT(object_update_param);
+       CHECK_MEMBER(object_update_param, oup_len);
+       CHECK_MEMBER(object_update_param, oup_padding);
+       CHECK_MEMBER(object_update_param, oup_padding2);
+       CHECK_MEMBER(object_update_param, oup_buf);
 }
 
-static void check_update_reply(void)
+static void check_object_update(void)
 {
        BLANK_LINE();
-       CHECK_STRUCT(update_reply);
-       CHECK_MEMBER(update_reply, ur_version);
-       CHECK_MEMBER(update_reply, ur_count);
-       CHECK_MEMBER(update_reply, ur_lens);
+       CHECK_STRUCT(object_update);
+       CHECK_MEMBER(object_update, ou_type);
+       CHECK_MEMBER(object_update, ou_params_count);
+       CHECK_MEMBER(object_update, ou_master_index);
+       CHECK_MEMBER(object_update, ou_flags);
+       CHECK_MEMBER(object_update, ou_padding1);
+       CHECK_MEMBER(object_update, ou_batchid);
+       CHECK_MEMBER(object_update, ou_fid);
+       CHECK_MEMBER(object_update, ou_params);
 }
 
-static void check_update(void)
+static void check_object_update_request(void)
 {
        BLANK_LINE();
-       CHECK_STRUCT(update);
-       CHECK_MEMBER(update, u_type);
-       CHECK_MEMBER(update, u_batchid);
-       CHECK_MEMBER(update, u_fid);
-       CHECK_MEMBER(update, u_lens);
-       CHECK_MEMBER(update, u_bufs);
+       CHECK_STRUCT(object_update_request);
+       CHECK_MEMBER(object_update_request, ourq_magic);
+       CHECK_MEMBER(object_update_request, ourq_count);
+       CHECK_MEMBER(object_update_request, ourq_padding);
+       CHECK_MEMBER(object_update_request, ourq_updates);
+}
+
+static void check_object_update_result(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(object_update_result);
+       CHECK_MEMBER(object_update_result, our_rc);
+       CHECK_MEMBER(object_update_result, our_datalen);
+       CHECK_MEMBER(object_update_result, our_padding);
+       CHECK_MEMBER(object_update_result, our_data);
+}
+
+static void check_object_update_reply(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(object_update_reply);
+       CHECK_MEMBER(object_update_reply, ourp_magic);
+       CHECK_MEMBER(object_update_reply, ourp_count);
+       CHECK_MEMBER(object_update_reply, ourp_padding);
+       CHECK_MEMBER(object_update_reply, ourp_lens);
 }
 
 static void check_lfsck_request(void)
@@ -2043,8 +2049,25 @@ static void check_lfsck_request(void)
        CHECK_MEMBER(lfsck_request, lr_async_windows);
        CHECK_MEMBER(lfsck_request, lr_padding_1);
        CHECK_MEMBER(lfsck_request, lr_fid);
+       CHECK_MEMBER(lfsck_request, lr_fid2);
+       CHECK_MEMBER(lfsck_request, lr_fid3);
        CHECK_MEMBER(lfsck_request, lr_padding_2);
        CHECK_MEMBER(lfsck_request, lr_padding_3);
+
+       CHECK_VALUE(LE_LASTID_REBUILDING);
+       CHECK_VALUE(LE_LASTID_REBUILT);
+       CHECK_VALUE(LE_PHASE1_DONE);
+       CHECK_VALUE(LE_PHASE2_DONE);
+       CHECK_VALUE(LE_START);
+       CHECK_VALUE(LE_STOP);
+       CHECK_VALUE(LE_QUERY);
+       CHECK_VALUE(LE_FID_ACCESSED);
+       CHECK_VALUE(LE_PEER_EXIT);
+       CHECK_VALUE(LE_CONDITIONAL_DESTROY);
+       CHECK_VALUE(LE_PAIRS_VERIFY);
+
+       CHECK_VALUE_X(LEF_TO_OST);
+       CHECK_VALUE_X(LEF_FROM_OST);
 }
 
 static void check_lfsck_reply(void)
@@ -2205,6 +2228,7 @@ main(int argc, char **argv)
        CHECK_VALUE(REINT_OPEN);
        CHECK_VALUE(REINT_SETXATTR);
        CHECK_VALUE(REINT_RMENTRY);
+       CHECK_VALUE(REINT_MIGRATE);
        CHECK_VALUE(REINT_MAX);
 
        CHECK_VALUE_X(DISP_IT_EXECD);
@@ -2298,8 +2322,8 @@ main(int argc, char **argv)
        CHECK_CVALUE(LUSTRE_RES_ID_VER_OID_OFF);
        /* CHECK_CVALUE(LUSTRE_RES_ID_WAS_VER_OFF); packed with OID */
 
-       CHECK_VALUE(UPDATE_OBJ);
-       CHECK_VALUE(UPDATE_LAST_OPC);
+       CHECK_VALUE(OUT_UPDATE);
+       CHECK_VALUE(OUT_UPDATE_LAST_OPC);
        CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_SEQ_OFF);
        CHECK_CVALUE(LUSTRE_RES_ID_QUOTA_VER_OID_OFF);
        CHECK_CVALUE(LUSTRE_RES_ID_HSH_OFF);
@@ -2339,18 +2363,18 @@ main(int argc, char **argv)
        check_lu_seq_range();
        check_lustre_mdt_attrs();
 
-       CHECK_VALUE(OBJ_CREATE);
-       CHECK_VALUE(OBJ_DESTROY);
-       CHECK_VALUE(OBJ_REF_ADD);
-       CHECK_VALUE(OBJ_REF_DEL);
-       CHECK_VALUE(OBJ_ATTR_SET);
-       CHECK_VALUE(OBJ_ATTR_GET);
-       CHECK_VALUE(OBJ_XATTR_SET);
-       CHECK_VALUE(OBJ_XATTR_GET);
-       CHECK_VALUE(OBJ_INDEX_LOOKUP);
-       CHECK_VALUE(OBJ_INDEX_LOOKUP);
-       CHECK_VALUE(OBJ_INDEX_INSERT);
-       CHECK_VALUE(OBJ_INDEX_DELETE);
+       CHECK_VALUE(OUT_CREATE);
+       CHECK_VALUE(OUT_DESTROY);
+       CHECK_VALUE(OUT_REF_ADD);
+       CHECK_VALUE(OUT_REF_DEL);
+       CHECK_VALUE(OUT_ATTR_SET);
+       CHECK_VALUE(OUT_ATTR_GET);
+       CHECK_VALUE(OUT_XATTR_SET);
+       CHECK_VALUE(OUT_XATTR_GET);
+       CHECK_VALUE(OUT_INDEX_LOOKUP);
+       CHECK_VALUE(OUT_INDEX_LOOKUP);
+       CHECK_VALUE(OUT_INDEX_INSERT);
+       CHECK_VALUE(OUT_INDEX_DELETE);
 
        check_som_attrs();
        check_hsm_attrs();
@@ -2428,13 +2452,6 @@ main(int argc, char **argv)
        check_getinfo_fid2path();
        check_ll_user_fiemap();
        check_ll_fiemap_extent();
-       printf("#ifdef LIBLUSTRE_POSIX_ACL\n");
-#ifndef LIBLUSTRE_POSIX_ACL
-#error build generator without LIBLUSTRE_POSIX_ACL defined - produce wrong check code.
-#endif
-       check_posix_acl_xattr_entry();
-       check_posix_acl_xattr_header();
-       printf("#endif\n");
        check_link_ea_header();
        check_link_ea_entry();
        check_layout_intent();
@@ -2451,9 +2468,11 @@ main(int argc, char **argv)
        check_hsm_user_request();
        check_hsm_user_import();
 
-       check_update_buf();
-       check_update_reply();
-       check_update();
+       check_object_update_param();
+       check_object_update();
+       check_object_update_request();
+       check_object_update_result();
+       check_object_update_reply();
 
        check_lfsck_request();
        check_lfsck_reply();