LU-3285 mds: combine DoM bit with other IBITS

[fs/lustre-release.git] / lustre / ptlrpc / wiretest.c

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index f5bd241..9240f37 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -43,6 +43,7 @@
 #include <lustre_disk.h>
 #include <uapi/linux/lustre/lustre_lfsck_user.h>
 
+
 void lustre_assert_wire_constants(void)
 {
        /* Wire protocol assertions generated by 'wirecheck'
@@ -251,7 +252,6 @@ void lustre_assert_wire_constants(void)
                        (long long)MDS_ATTR_FROM_OPEN);
        LASSERTF(MDS_ATTR_BLOCKS == 0x0000000000008000ULL, "found 0x%.16llxULL\n",
                        (long long)MDS_ATTR_BLOCKS);
-
        LASSERTF(MDS_ATTR_PROJID == 0x0000000000010000ULL, "found 0x%.16llxULL\n",
                        (long long)MDS_ATTR_PROJID);
        LASSERTF(FLD_QUERY == 900, "found %lld\n",
@@ -1556,7 +1556,6 @@ void lustre_assert_wire_constants(void)
                 OBD_MD_DEFAULT_MEA);
        LASSERTF(OBD_MD_FLOSTLAYOUT == (0x0080000000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLOSTLAYOUT);
-
        LASSERTF(OBD_MD_FLPROJID == (0x0100000000000000ULL), "found 0x%.16llxULL\n",
                 OBD_MD_FLPROJID);
        CLASSERT(OBD_FL_INLINEDATA == 0x00000001);
@@ -2315,14 +2314,14 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct mdt_body, mbo_projid));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_projid) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct mdt_body *)0)->mbo_projid));
-       LASSERTF((int)offsetof(struct mdt_body, mbo_padding_6) == 176, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_body, mbo_padding_6));
-       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_padding_6) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_padding_6));
-       LASSERTF((int)offsetof(struct mdt_body, mbo_padding_7) == 184, "found %lld\n",
-                (long long)(int)offsetof(struct mdt_body, mbo_padding_7));
-       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_padding_7) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_padding_7));
+       LASSERTF((int)offsetof(struct mdt_body, mbo_dom_size) == 176, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_body, mbo_dom_size));
+       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_dom_size) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_dom_size));
+       LASSERTF((int)offsetof(struct mdt_body, mbo_dom_blocks) == 184, "found %lld\n",
+                (long long)(int)offsetof(struct mdt_body, mbo_dom_blocks));
+       LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_dom_blocks) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct mdt_body *)0)->mbo_dom_blocks));
        LASSERTF((int)offsetof(struct mdt_body, mbo_padding_8) == 192, "found %lld\n",
                 (long long)(int)offsetof(struct mdt_body, mbo_padding_8));
        LASSERTF((int)sizeof(((struct mdt_body *)0)->mbo_padding_8) == 8, "found %lld\n",
@@ -3779,14 +3778,14 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct llog_setattr64_rec, lsr_valid));
        LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_valid) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_valid));
+       LASSERTF((int)offsetof(struct llog_setattr64_rec, lsr_tail) == 56, "found %lld\n",
+                (long long)(int)offsetof(struct llog_setattr64_rec, lsr_tail));
+       LASSERTF((int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct llog_setattr64_rec *)0)->lsr_tail));
        LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_projid) == 56, "found %lld\n",
                 (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_projid));
        LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_projid) == 4, "found %lld\n",
                 (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_projid));
-       LASSERTF((int)offsetof(struct llog_setattr64_rec_v2, lsr_tail) == 80, "found %lld\n",
-                (long long)(int)offsetof(struct llog_setattr64_rec_v2, lsr_tail));
-       LASSERTF((int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_tail) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct llog_setattr64_rec_v2 *)0)->lsr_tail));
 
        /* Checks for struct llog_size_change_rec */
        LASSERTF((int)sizeof(struct llog_size_change_rec) == 64, "found %lld\n",
@@ -4443,12 +4442,10 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(posix_acl_xattr_header, a_version));
        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_version) == 4, "found %lld\n",
                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_version));
-#ifndef HAVE_STRUCT_POSIX_ACL_XATTR
        LASSERTF((int)offsetof(posix_acl_xattr_header, a_entries) == 4, "found %lld\n",
                 (long long)(int)offsetof(posix_acl_xattr_header, a_entries));
        LASSERTF((int)sizeof(((posix_acl_xattr_header *)0)->a_entries) == 0, "found %lld\n",
                 (long long)(int)sizeof(((posix_acl_xattr_header *)0)->a_entries));
-#endif
 #endif /* CONFIG_FS_POSIX_ACL */
 
        /* Checks for struct link_ea_header */