From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26063 invoked by alias); 13 Mar 2008 17:19:07 -0000 Received: (qmail 26032 invoked by uid 9453); 13 Mar 2008 17:19:06 -0000 Date: Thu, 13 Mar 2008 17:19:00 -0000 Message-ID: <20080313171906.26017.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.02.00-15-gba52942 X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 31b6d55cadb4aa87a76d907dc2fa7696fda89379 X-Git-Newrev: ba52942d40bc738eb991c82e8cfeab242cfa18f0 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: 2008-q1/txt/msg00312.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=ba52942d40bc738eb991c82e8cfeab242cfa18f0 The branch, STABLE2 has been updated via ba52942d40bc738eb991c82e8cfeab242cfa18f0 (commit) from 31b6d55cadb4aa87a76d907dc2fa7696fda89379 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ba52942d40bc738eb991c82e8cfeab242cfa18f0 Author: David Teigland Date: Thu Mar 13 12:14:22 2008 -0500 dlm_tool: print correct rq mode in lockdump The rq mode in a lockdump was incorrectly showing up as NL for granted locks instead of IV (invalid). Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: dlm/tool/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index 078cf26..330d795 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -26,6 +26,8 @@ #include "libdlm.h" #include "dlm_controld.h" +#define LKM_IVMODE -1 + #define OPTION_STRING "MhVvd:m:" #define OP_JOIN 1 @@ -367,14 +369,14 @@ void do_lockdump(char *name) continue; } - /* A hack because dlm-kernel doesn't set rqmode back to NL when + /* A hack because dlm-kernel doesn't set rqmode back to IV when a NOQUEUE convert fails, which means in a lockdump it looks like a granted lock is still converting since rqmode is not - NL. (does it make sense to include status in the output, + IV. (does it make sense to include status in the output, e.g. G,C,W?) */ if (status == DLM_LKSTS_GRANTED) - rqmode = LKM_NLMODE; + rqmode = LKM_IVMODE; printf("id %08x gr %s rq %s pid %u master %d \"%s\"\n", id, mode_str(grmode), mode_str(rqmode), hooks/post-receive -- Cluster Project