LU-1710 lvb: variable sized LVB support

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

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 8006b25..fdfaea6 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -54,8 +54,8 @@ void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux chopin 2.6.32.wc #9 SMP Thu Feb 9 14:43:41 CST 2012 x86_64 x86_64 x86_64 
-         * with gcc version 4.4.4 20100726 (Red Hat 4.4.4-13) (GCC)  */
+         * running on Linux mercury 2.6.32-279.5.1.el6_lustre.x86_64 #1 SMP Tue Aug 21 00:00:41 PDT 2
+         * with gcc version 4.4.6 20120305 (Red Hat 4.4.6-4) (GCC)  */
 
 
         /* Constants... */
@@ -3049,8 +3049,32 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res2));
 
+        /* Checks for struct ost_lvb_v1 */
+        LASSERTF((int)sizeof(struct ost_lvb_v1) == 40, "found %lld\n",
+                 (long long)(int)sizeof(struct ost_lvb_v1));
+        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_size) == 0, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_size));
+        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_size));
+        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_mtime) == 8, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_mtime));
+        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_mtime));
+        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_atime) == 16, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_atime));
+        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_atime));
+        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_ctime) == 24, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_ctime));
+        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_ctime));
+        LASSERTF((int)offsetof(struct ost_lvb_v1, lvb_blocks) == 32, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb_v1, lvb_blocks));
+        LASSERTF((int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks) == 8, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb_v1 *)0)->lvb_blocks));
+
         /* Checks for struct ost_lvb */
-        LASSERTF((int)sizeof(struct ost_lvb) == 40, "found %lld\n",
+        LASSERTF((int)sizeof(struct ost_lvb) == 56, "found %lld\n",
                  (long long)(int)sizeof(struct ost_lvb));
         LASSERTF((int)offsetof(struct ost_lvb, lvb_size) == 0, "found %lld\n",
                  (long long)(int)offsetof(struct ost_lvb, lvb_size));
@@ -3072,6 +3096,22 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct ost_lvb, lvb_blocks));
         LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_blocks) == 8, "found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_mtime_ns) == 40, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb, lvb_mtime_ns));
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_mtime_ns));
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_atime_ns) == 44, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb, lvb_atime_ns));
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_atime_ns));
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_ctime_ns) == 48, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb, lvb_ctime_ns));
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_ctime_ns));
+        LASSERTF((int)offsetof(struct ost_lvb, lvb_padding) == 52, "found %lld\n",
+                 (long long)(int)offsetof(struct ost_lvb, lvb_padding));
+        LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_padding) == 4, "found %lld\n",
+                 (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_padding));
 
         /* Checks for struct lquota_lvb */
         LASSERTF((int)sizeof(struct lquota_lvb) == 40, "found %lld\n",