Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Land b_smallfix onto HEAD (20040423_1603)
[fs/lustre-release.git] / lustre / utils / wiretest.c
diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 849b0f0..dfec4fa 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -976,7 +976,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_res_id *)0)->name[4]));
 
         /* Checks for struct ldlm_extent */
-        LASSERTF((int)sizeof(struct ldlm_extent) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_extent) == 24, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_extent));
         LASSERTF(offsetof(struct ldlm_extent, start) == 0, " found %lld\n",
                  (long long)offsetof(struct ldlm_extent, start));
@@ -986,9 +986,13 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct ldlm_extent, end));
         LASSERTF((int)sizeof(((struct ldlm_extent *)0)->end) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_extent *)0)->end));
+        LASSERTF(offsetof(struct ldlm_extent, gid) == 16, " found %lld\n",
+                 (long long)offsetof(struct ldlm_extent, gid));
+        LASSERTF((int)sizeof(((struct ldlm_extent *)0)->gid) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_extent *)0)->gid));
 
         /* Checks for struct ldlm_flock */
-        LASSERTF((int)sizeof(struct ldlm_flock) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_flock) == 40, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_flock));
         LASSERTF(offsetof(struct ldlm_flock, start) == 0, " found %lld\n",
                  (long long)offsetof(struct ldlm_flock, start));
@@ -998,18 +1002,18 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct ldlm_flock, end));
         LASSERTF((int)sizeof(((struct ldlm_flock *)0)->end) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock *)0)->end));
-        LASSERTF(offsetof(struct ldlm_flock, blocking_export) == 16, " found %lld\n",
-                 (long long)offsetof(struct ldlm_flock, blocking_export));
-        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_export) == 8, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_export));
+        LASSERTF(offsetof(struct ldlm_flock, pid) == 16, " found %lld\n",
+                 (long long)offsetof(struct ldlm_flock, pid));
+        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->pid) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_flock *)0)->pid));
         LASSERTF(offsetof(struct ldlm_flock, blocking_pid) == 24, " found %lld\n",
                  (long long)offsetof(struct ldlm_flock, blocking_pid));
-        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_pid) == 4, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_pid) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_pid));
-        LASSERTF(offsetof(struct ldlm_flock, pid) == 28, " found %lld\n",
-                 (long long)offsetof(struct ldlm_flock, pid));
-        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->pid) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct ldlm_flock *)0)->pid));
+        LASSERTF(offsetof(struct ldlm_flock, blocking_export) == 32, " found %lld\n",
+                 (long long)offsetof(struct ldlm_flock, blocking_export));
+        LASSERTF((int)sizeof(((struct ldlm_flock *)0)->blocking_export) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_export));
 
         /* Checks for struct ldlm_intent */
         LASSERTF((int)sizeof(struct ldlm_intent) == 8, " found %lld\n",
@@ -1032,7 +1036,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_resource_desc *)0)->lr_name));
 
         /* Checks for struct ldlm_lock_desc */
-        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_lock_desc) == 88, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_lock_desc));
         LASSERTF(offsetof(struct ldlm_lock_desc, l_resource) == 0, " found %lld\n",
                  (long long)offsetof(struct ldlm_lock_desc, l_resource));
@@ -1048,11 +1052,11 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_granted_mode));
         LASSERTF(offsetof(struct ldlm_lock_desc, l_policy_data) == 48, " found %lld\n",
                  (long long)offsetof(struct ldlm_lock_desc, l_policy_data));
-        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 32, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data) == 40, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_lock_desc *)0)->l_policy_data));
 
         /* Checks for struct ldlm_request */
-        LASSERTF((int)sizeof(struct ldlm_request) == 104, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_request) == 112, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_request));
         LASSERTF(offsetof(struct ldlm_request, lock_flags) == 0, " found %lld\n",
                  (long long)offsetof(struct ldlm_request, lock_flags));
@@ -1060,19 +1064,19 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_flags));
         LASSERTF(offsetof(struct ldlm_request, lock_desc) == 8, " found %lld\n",
                  (long long)offsetof(struct ldlm_request, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 88, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        LASSERTF(offsetof(struct ldlm_request, lock_handle1) == 88, " found %lld\n",
+        LASSERTF(offsetof(struct ldlm_request, lock_handle1) == 96, " found %lld\n",
                  (long long)offsetof(struct ldlm_request, lock_handle1));
         LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle1) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle1));
-        LASSERTF(offsetof(struct ldlm_request, lock_handle2) == 96, " found %lld\n",
+        LASSERTF(offsetof(struct ldlm_request, lock_handle2) == 104, " found %lld\n",
                  (long long)offsetof(struct ldlm_request, lock_handle2));
         LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_handle2) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_handle2));
 
         /* Checks for struct ldlm_reply */
-        LASSERTF((int)sizeof(struct ldlm_reply) == 112, " found %lld\n",
+        LASSERTF((int)sizeof(struct ldlm_reply) == 120, " found %lld\n",
                  (long long)(int)sizeof(struct ldlm_reply));
         LASSERTF(offsetof(struct ldlm_reply, lock_flags) == 0, " found %lld\n",
                  (long long)offsetof(struct ldlm_reply, lock_flags));
@@ -1080,17 +1084,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_flags));
         LASSERTF(offsetof(struct ldlm_request, lock_desc) == 8, " found %lld\n",
                  (long long)offsetof(struct ldlm_request, lock_desc));
-        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 80, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ldlm_request *)0)->lock_desc) == 88, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_request *)0)->lock_desc));
-        LASSERTF(offsetof(struct ldlm_reply, lock_handle) == 88, " found %lld\n",
+        LASSERTF(offsetof(struct ldlm_reply, lock_handle) == 96, " found %lld\n",
                  (long long)offsetof(struct ldlm_reply, lock_handle));
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_handle) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_handle));
-        LASSERTF(offsetof(struct ldlm_reply, lock_policy_res1) == 96, " found %lld\n",
+        LASSERTF(offsetof(struct ldlm_reply, lock_policy_res1) == 104, " found %lld\n",
                  (long long)offsetof(struct ldlm_reply, lock_policy_res1));
         LASSERTF((int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ldlm_reply *)0)->lock_policy_res1));
-        LASSERTF(offsetof(struct ldlm_reply, lock_policy_res2) == 104, " found %lld\n",
+        LASSERTF(offsetof(struct ldlm_reply, lock_policy_res2) == 112, " found %lld\n",
                  (long long)offsetof(struct ldlm_reply, lock_policy_res2));
         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));
@@ -1368,7 +1372,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_gen_rec *)0)->lgr_tail));
 
         /* Checks for struct llog_log_hdr */
-        LASSERTF((int)sizeof(struct llog_log_hdr) == 4096, " found %lld\n",
+        LASSERTF((int)sizeof(struct llog_log_hdr) == 8192, " found %lld\n",
                  (long long)(int)sizeof(struct llog_log_hdr));
         LASSERTF(offsetof(struct llog_log_hdr, llh_hdr) == 0, " found %lld\n",
                  (long long)offsetof(struct llog_log_hdr, llh_hdr));
@@ -1408,9 +1412,9 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_reserved));
         LASSERTF(offsetof(struct llog_log_hdr, llh_bitmap) == 88, " found %lld\n",
                  (long long)offsetof(struct llog_log_hdr, llh_bitmap));
-        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap) == 4000, " found %lld\n",
+        LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap) == 8096, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_bitmap));
-        LASSERTF(offsetof(struct llog_log_hdr, llh_tail) == 4088, " found %lld\n",
+        LASSERTF(offsetof(struct llog_log_hdr, llh_tail) == 8184, " found %lld\n",
                  (long long)offsetof(struct llog_log_hdr, llh_tail));
         LASSERTF((int)sizeof(((struct llog_log_hdr *)0)->llh_tail) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct llog_log_hdr *)0)->llh_tail));
Lustre primary development and releases