This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE2 - dlm: Make dlm_tcpdump compile for RHEL5
- From: Christine Caulfield <chrissie at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 13 May 2009 11:07:11 +0000 (UTC)
- Subject: cluster: STABLE2 - dlm: Make dlm_tcpdump compile for RHEL5
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d6a6f733525ec28f7485daa58be62facea7dc4d5
Commit: d6a6f733525ec28f7485daa58be62facea7dc4d5
Parent: fbceb5dfc3cbdb627c17a77f13fe97611df31ad0
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Wed May 13 12:06:46 2009 +0100
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed May 13 12:06:46 2009 +0100
dlm: Make dlm_tcpdump compile for RHEL5
It's still untested though ;-)
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
dlm/tests/tcpdump/dlm_tcpdump.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlm/tests/tcpdump/dlm_tcpdump.c b/dlm/tests/tcpdump/dlm_tcpdump.c
index 6741888..6953aef 100644
--- a/dlm/tests/tcpdump/dlm_tcpdump.c
+++ b/dlm/tests/tcpdump/dlm_tcpdump.c
@@ -13,8 +13,6 @@
*
**********************************************************************/
-#define RHEL4
-
#include <pcap.h>
#include <stdio.h>
#include <stdlib.h>
@@ -72,14 +70,15 @@ struct dlm_message {
#ifdef RHEL5
+
struct dlm_message {
uint32_t m_version;
uint32_t m_lockspace;
uint32_t m_nodeid; /* nodeid of sender */
uint16_t m_length;
- uint8_t m_msg; /* DLM_MSG, DLM_RCOM */
+ uint8_t m_msgtype; /* DLM_MSG, DLM_RCOM */
uint8_t m_pad;
- uint32_t m_msg; /* DLM_MSG_ */
+ uint32_t m_cmd; /* DLM_MSG_ */
uint32_t m_rnodeid;
uint32_t m_pid;
uint32_t m_lkid; /* lkid on sender */