LU-4961 lustre: remove liblustre.h and obd.h from userspace

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

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index c41395c..f27f748 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -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>
 
@@ -1751,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();
@@ -2069,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)
@@ -2231,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);
@@ -2454,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();