From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28762 invoked by alias); 13 May 2009 11:07:42 -0000 Received: (qmail 28755 invoked by alias); 13 May 2009 11:07:42 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE2 - dlm: Make dlm_tcpdump compile for RHEL5 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: fbceb5dfc3cbdb627c17a77f13fe97611df31ad0 X-Git-Newrev: d6a6f733525ec28f7485daa58be62facea7dc4d5 From: Christine Caulfield Message-Id: <20090513110711.830B51201C1@lists.fedorahosted.org> Date: Wed, 13 May 2009 11:07:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00303.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d6a6f733525ec28f7485daa58be62facea7dc4d5 Commit: d6a6f733525ec28f7485daa58be62facea7dc4d5 Parent: fbceb5dfc3cbdb627c17a77f13fe97611df31ad0 Author: Christine Caulfield AuthorDate: Wed May 13 12:06:46 2009 +0100 Committer: Christine Caulfield 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 --- 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 #include #include @@ -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 */