Whamcloud - gitweb
LU-5607 ptlrpc: restore posix_acl_xattr checks
[fs/lustre-release.git] / lustre / utils / wirecheck.c
index ae85ce6..cf030e9 100644 (file)
@@ -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, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -37,9 +37,9 @@
 #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/lustre_lfsck_user.h>
 #include <lustre_disk.h>
 
 #define BLANK_LINE()                                           \
@@ -525,6 +525,8 @@ check_obd_connect_data(void)
        CHECK_DEFINE_64X(OBD_CONNECT_FLOCK_DEAD);
        CHECK_DEFINE_64X(OBD_CONNECT_OPEN_BY_FID);
        CHECK_DEFINE_64X(OBD_CONNECT_LFSCK);
+       CHECK_DEFINE_64X(OBD_CONNECT_UNLINK_CLOSE);
+       CHECK_DEFINE_64X(OBD_CONNECT_DIR_STRIPE);
 
        CHECK_VALUE_X(OBD_CKSUM_CRC32);
        CHECK_VALUE_X(OBD_CKSUM_ADLER);
@@ -689,6 +691,29 @@ check_lov_mds_md_v3(void)
 }
 
 static void
+check_lmv_mds_md_v1(void)
+{
+       BLANK_LINE();
+       CHECK_STRUCT(lmv_mds_md_v1);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_magic);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_stripe_count);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_master_mdt_index);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_hash_type);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_layout_version);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_padding1);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_padding2);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_padding3);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_pool_name[LOV_MAXPOOLNAME]);
+       CHECK_MEMBER(lmv_mds_md_v1, lmv_stripe_fids[0]);
+
+       CHECK_CDEFINE(LMV_MAGIC_V1);
+       CHECK_CDEFINE(LMV_MAGIC_STRIPE);
+       CHECK_CDEFINE(LMV_HASH_TYPE_MASK);
+       CHECK_CDEFINE(LMV_HASH_FLAG_MIGRATION);
+       CHECK_CDEFINE(LMV_HASH_FLAG_DEAD);
+}
+
+static void
 check_obd_statfs(void)
 {
        BLANK_LINE();
@@ -829,9 +854,9 @@ check_niobuf_remote(void)
 {
        BLANK_LINE();
        CHECK_STRUCT(niobuf_remote);
-       CHECK_MEMBER(niobuf_remote, offset);
-       CHECK_MEMBER(niobuf_remote, len);
-       CHECK_MEMBER(niobuf_remote, flags);
+       CHECK_MEMBER(niobuf_remote, rnb_offset);
+       CHECK_MEMBER(niobuf_remote, rnb_len);
+       CHECK_MEMBER(niobuf_remote, rnb_flags);
 
        CHECK_DEFINE_X(OBD_BRW_READ);
        CHECK_DEFINE_X(OBD_BRW_WRITE);
@@ -872,39 +897,39 @@ check_mdt_body(void)
 {
        BLANK_LINE();
        CHECK_STRUCT(mdt_body);
-       CHECK_MEMBER(mdt_body, fid1);
-       CHECK_MEMBER(mdt_body, fid2);
-       CHECK_MEMBER(mdt_body, handle);
-       CHECK_MEMBER(mdt_body, valid);
-       CHECK_MEMBER(mdt_body, size);
-       CHECK_MEMBER(mdt_body, mtime);
-       CHECK_MEMBER(mdt_body, atime);
-       CHECK_MEMBER(mdt_body, ctime);
-       CHECK_MEMBER(mdt_body, blocks);
-       CHECK_MEMBER(mdt_body, t_state);
-       CHECK_MEMBER(mdt_body, fsuid);
-       CHECK_MEMBER(mdt_body, fsgid);
-       CHECK_MEMBER(mdt_body, capability);
-       CHECK_MEMBER(mdt_body, mode);
-       CHECK_MEMBER(mdt_body, uid);
-       CHECK_MEMBER(mdt_body, gid);
-       CHECK_MEMBER(mdt_body, flags);
-       CHECK_MEMBER(mdt_body, rdev);
-       CHECK_MEMBER(mdt_body, nlink);
-       CHECK_MEMBER(mdt_body, unused2);
-       CHECK_MEMBER(mdt_body, suppgid);
-       CHECK_MEMBER(mdt_body, eadatasize);
-       CHECK_MEMBER(mdt_body, aclsize);
-       CHECK_MEMBER(mdt_body, max_mdsize);
-       CHECK_MEMBER(mdt_body, max_cookiesize);
-       CHECK_MEMBER(mdt_body, uid_h);
-       CHECK_MEMBER(mdt_body, gid_h);
-       CHECK_MEMBER(mdt_body, padding_5);
-       CHECK_MEMBER(mdt_body, padding_6);
-       CHECK_MEMBER(mdt_body, padding_7);
-       CHECK_MEMBER(mdt_body, padding_8);
-       CHECK_MEMBER(mdt_body, padding_9);
-       CHECK_MEMBER(mdt_body, padding_10);
+       CHECK_MEMBER(mdt_body, mbo_fid1);
+       CHECK_MEMBER(mdt_body, mbo_fid2);
+       CHECK_MEMBER(mdt_body, mbo_handle);
+       CHECK_MEMBER(mdt_body, mbo_valid);
+       CHECK_MEMBER(mdt_body, mbo_size);
+       CHECK_MEMBER(mdt_body, mbo_mtime);
+       CHECK_MEMBER(mdt_body, mbo_atime);
+       CHECK_MEMBER(mdt_body, mbo_ctime);
+       CHECK_MEMBER(mdt_body, mbo_blocks);
+       CHECK_MEMBER(mdt_body, mbo_t_state);
+       CHECK_MEMBER(mdt_body, mbo_fsuid);
+       CHECK_MEMBER(mdt_body, mbo_fsgid);
+       CHECK_MEMBER(mdt_body, mbo_capability);
+       CHECK_MEMBER(mdt_body, mbo_mode);
+       CHECK_MEMBER(mdt_body, mbo_uid);
+       CHECK_MEMBER(mdt_body, mbo_gid);
+       CHECK_MEMBER(mdt_body, mbo_flags);
+       CHECK_MEMBER(mdt_body, mbo_rdev);
+       CHECK_MEMBER(mdt_body, mbo_nlink);
+       CHECK_MEMBER(mdt_body, mbo_unused2);
+       CHECK_MEMBER(mdt_body, mbo_suppgid);
+       CHECK_MEMBER(mdt_body, mbo_eadatasize);
+       CHECK_MEMBER(mdt_body, mbo_aclsize);
+       CHECK_MEMBER(mdt_body, mbo_max_mdsize);
+       CHECK_MEMBER(mdt_body, mbo_max_cookiesize);
+       CHECK_MEMBER(mdt_body, mbo_uid_h);
+       CHECK_MEMBER(mdt_body, mbo_gid_h);
+       CHECK_MEMBER(mdt_body, mbo_padding_5);
+       CHECK_MEMBER(mdt_body, mbo_padding_6);
+       CHECK_MEMBER(mdt_body, mbo_padding_7);
+       CHECK_MEMBER(mdt_body, mbo_padding_8);
+       CHECK_MEMBER(mdt_body, mbo_padding_9);
+       CHECK_MEMBER(mdt_body, mbo_padding_10);
 
        CHECK_VALUE_O(MDS_FMODE_CLOSED);
        CHECK_VALUE_O(MDS_FMODE_EXEC);
@@ -1499,7 +1524,7 @@ check_llog_setattr64_rec(void)
        CHECK_MEMBER(llog_setattr64_rec, lsr_uid_h);
        CHECK_MEMBER(llog_setattr64_rec, lsr_gid);
        CHECK_MEMBER(llog_setattr64_rec, lsr_gid_h);
-       CHECK_MEMBER(llog_setattr64_rec, lsr_padding);
+       CHECK_MEMBER(llog_setattr64_rec, lsr_valid);
        CHECK_MEMBER(llog_setattr64_rec, lsr_tail);
 }
 
@@ -1652,6 +1677,20 @@ check_llogd_body(void)
        CHECK_CVALUE(LLOG_ORIGIN_HANDLE_DESTROY);
        CHECK_CVALUE(LLOG_FIRST_OPC);
        CHECK_CVALUE(LLOG_LAST_OPC);
+
+       CHECK_CVALUE(LLOG_CONFIG_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_CONFIG_REPL_CTXT);
+       CHECK_CVALUE(LLOG_MDS_OST_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_MDS_OST_REPL_CTXT);
+       CHECK_CVALUE(LLOG_SIZE_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_SIZE_REPL_CTXT);
+       CHECK_CVALUE(LLOG_TEST_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_TEST_REPL_CTXT);
+       CHECK_CVALUE(LLOG_CHANGELOG_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_CHANGELOG_REPL_CTXT);
+       CHECK_CVALUE(LLOG_CHANGELOG_USER_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_AGENT_ORIG_CTXT);
+       CHECK_CVALUE(LLOG_MAX_CTXTS);
 }
 
 static void
@@ -1750,23 +1789,43 @@ check_getinfo_fid2path(void)
        CHECK_MEMBER(getinfo_fid2path, gf_path[0]);
 }
 
+/* We don't control the definitions of posix_acl_xattr_{entry,header}
+ * and so we shouldn't have used them in our wire protocol. But it's
+ * too late now and so we emit checks against the *fixed* definitions
+ * below. See LU-5607. */
+
+typedef struct {
+       __u16                   e_tag;
+       __u16                   e_perm;
+       __u32                   e_id;
+} posix_acl_xattr_entry;
+
+typedef struct {
+       __u32                   a_version;
+       posix_acl_xattr_entry   a_entries[0];
+} posix_acl_xattr_header;
+
 static void
 check_posix_acl_xattr_entry(void)
 {
        BLANK_LINE();
+       printf("#ifdef CONFIG_FS_POSIX_ACL\n");
        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);
+       printf("#endif /* CONFIG_FS_POSIX_ACL */\n");
 }
 
 static void
 check_posix_acl_xattr_header(void)
 {
        BLANK_LINE();
+       printf("#ifdef CONFIG_FS_POSIX_ACL\n");
        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);
+       printf("#endif /* CONFIG_FS_POSIX_ACL */\n");
 }
 
 static void
@@ -2074,6 +2133,11 @@ static void check_lfsck_request(void)
        CHECK_MEMBER(lfsck_request, lr_padding_2);
        CHECK_MEMBER(lfsck_request, lr_padding_3);
 
+       CHECK_VALUE_X(LFSCK_TYPE_SCRUB);
+       CHECK_VALUE_X(LFSCK_TYPE_LAYOUT);
+       CHECK_VALUE_X(LFSCK_TYPE_DNE);
+       CHECK_VALUE_X(LFSCK_TYPE_NAMESPACE);
+
        CHECK_VALUE(LE_LASTID_REBUILDING);
        CHECK_VALUE(LE_LASTID_REBUILT);
        CHECK_VALUE(LE_PHASE1_DONE);
@@ -2410,6 +2474,7 @@ main(int argc, char **argv)
        check_lov_ost_data_v1();
        check_lov_mds_md_v1();
        check_lov_mds_md_v3();
+       check_lmv_mds_md_v1();
        check_obd_statfs();
        check_obd_ioobj();
        check_obd_quotactl();
@@ -2472,13 +2537,8 @@ 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();