LU-7225 llite: ladvise protocol changes

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

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 1ae1cdf..1cf7c04 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -5002,8 +5002,16 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)sizeof(struct lu_ladvise));
        LASSERTF((int)offsetof(struct lu_ladvise, lla_advice) == 0, "found %lld\n",
                 (long long)(int)offsetof(struct lu_ladvise, lla_advice));
-       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_advice) == 8, "found %lld\n",
+       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_advice) == 2, "found %lld\n",
                 (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_advice));
+       LASSERTF((int)offsetof(struct lu_ladvise, lla_value1) == 2, "found %lld\n",
+                (long long)(int)offsetof(struct lu_ladvise, lla_value1));
+       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_value1) == 2, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_value1));
+       LASSERTF((int)offsetof(struct lu_ladvise, lla_value2) == 4, "found %lld\n",
+                (long long)(int)offsetof(struct lu_ladvise, lla_value2));
+       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_value2) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_value2));
        LASSERTF((int)offsetof(struct lu_ladvise, lla_start) == 8, "found %lld\n",
                 (long long)(int)offsetof(struct lu_ladvise, lla_start));
        LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_start) == 8, "found %lld\n",
@@ -5012,10 +5020,14 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct lu_ladvise, lla_end));
        LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_end) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_end));
-       LASSERTF((int)offsetof(struct lu_ladvise, lla_padding) == 24, "found %lld\n",
-                (long long)(int)offsetof(struct lu_ladvise, lla_padding));
-       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_padding) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_padding));
+       LASSERTF((int)offsetof(struct lu_ladvise, lla_value3) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct lu_ladvise, lla_value3));
+       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_value3) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_value3));
+       LASSERTF((int)offsetof(struct lu_ladvise, lla_value4) == 28, "found %lld\n",
+                (long long)(int)offsetof(struct lu_ladvise, lla_value4));
+       LASSERTF((int)sizeof(((struct lu_ladvise *)0)->lla_value4) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct lu_ladvise *)0)->lla_value4));
 
        /* Checks for struct ladvise_hdr */
        LASSERTF(LADVISE_MAGIC == 0x1ADF1CE0, "found 0x%.8x\n",
@@ -5034,14 +5046,18 @@ void lustre_assert_wire_constants(void)
                 (long long)(int)offsetof(struct ladvise_hdr, lah_flags));
        LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_flags) == 8, "found %lld\n",
                 (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_flags));
-       LASSERTF((int)offsetof(struct ladvise_hdr, lah_padding1) == 16, "found %lld\n",
-                (long long)(int)offsetof(struct ladvise_hdr, lah_padding1));
-       LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_padding1) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_padding1));
-       LASSERTF((int)offsetof(struct ladvise_hdr, lah_padding2) == 24, "found %lld\n",
-                (long long)(int)offsetof(struct ladvise_hdr, lah_padding2));
-       LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_padding2) == 8, "found %lld\n",
-                (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_padding2));
+       LASSERTF((int)offsetof(struct ladvise_hdr, lah_value1) == 16, "found %lld\n",
+                (long long)(int)offsetof(struct ladvise_hdr, lah_value1));
+       LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_value1) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_value1));
+       LASSERTF((int)offsetof(struct ladvise_hdr, lah_value2) == 20, "found %lld\n",
+                (long long)(int)offsetof(struct ladvise_hdr, lah_value2));
+       LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_value2) == 4, "found %lld\n",
+                (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_value2));
+       LASSERTF((int)offsetof(struct ladvise_hdr, lah_value3) == 24, "found %lld\n",
+                (long long)(int)offsetof(struct ladvise_hdr, lah_value3));
+       LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_value3) == 8, "found %lld\n",
+                (long long)(int)sizeof(((struct ladvise_hdr *)0)->lah_value3));
        LASSERTF((int)offsetof(struct ladvise_hdr, lah_advise) == 32, "found %lld\n",
                 (long long)(int)offsetof(struct ladvise_hdr, lah_advise));
        LASSERTF((int)sizeof(((struct ladvise_hdr *)0)->lah_advise) == 0, "found %lld\n",