From d7ac09b712ce9dc444ac5dc6ff350700cccf6564 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Fri, 19 Mar 2004 10:04:46 +0000
Subject: [PATCH] Update the oh-so-important ptlrpc/pack_generic version of
lustre_assert_wire_constants(), without which it is impossible to run a test.
Likely needs to be merged back to b_cray_* from whence it came.
---
lustre/ptlrpc/pack_generic.c | 23 +++++++++++------------
lustre/utils/wirecheck.c | 4 ++--
lustre/utils/wiretest.c | 18 +++++++++---------
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 7e5ccefcdf..1ed4f290c0 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -1679,7 +1679,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));
@@ -1695,11 +1695,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));
@@ -1707,19 +1707,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));
@@ -1727,17 +1727,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));
@@ -2141,4 +2141,3 @@ void lustre_assert_wire_constants(void)
(long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
}
-
diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index f1f05f51b1..e1ca25eb6e 100644
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -416,9 +416,9 @@ check_ldlm_flock(void)
CHECK_STRUCT(ldlm_flock);
CHECK_MEMBER(ldlm_flock, start);
CHECK_MEMBER(ldlm_flock, end);
- CHECK_MEMBER(ldlm_flock, blocking_export);
- CHECK_MEMBER(ldlm_flock, blocking_pid);
CHECK_MEMBER(ldlm_flock, pid);
+ CHECK_MEMBER(ldlm_flock, blocking_pid);
+ CHECK_MEMBER(ldlm_flock, blocking_export);
}
void
diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 077601a56d..dfec4faaf8 100644
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -25,7 +25,7 @@ int main()
void lustre_assert_wire_constants(void)
{
/* Wire protocol assertions generated by 'wirecheck'
- * running on Linux innova.tion.org 2.4.20-30.9-87k.37-b1_2.RC_1_2_0_3.200403111837 #1 Thu Ma
+ * running on Linux schnapps.adilger.int 2.4.22-l32 #4 Thu Jan 8 14:32:57 MST 2004 i686 i686
* with gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5) */
@@ -1002,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) == 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));
- 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) == 8, " found %lld\n",
- (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_pid));
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) == 8, " found %lld\n",
+ (long long)(int)sizeof(((struct ldlm_flock *)0)->blocking_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",
--
GitLab