From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9091 invoked by alias); 11 Mar 2009 21:09:52 -0000 Received: (qmail 8912 invoked by alias); 11 Mar 2009 21:09:52 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_64,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_64,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - dlm_tool: fix lockdebug parsing of first_lkid To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 4fc740093e8b51d5a12c7110ac49ea99a880156f X-Git-Newrev: 2766506287ef45dce3eb060fba23fd93538114d2 From: David Teigland Message-Id: <20090311210929.C5EF212033E@lists.fedorahosted.org> Date: Wed, 11 Mar 2009 21:09: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-q1/txt/msg00745.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=2766506287ef45dce3eb060fba23fd93538114d2 Commit: 2766506287ef45dce3eb060fba23fd93538114d2 Parent: 4fc740093e8b51d5a12c7110ac49ea99a880156f Author: David Teigland AuthorDate: Wed Mar 11 16:05:08 2009 -0500 Committer: David Teigland CommitterDate: Wed Mar 11 16:05:08 2009 -0500 dlm_tool: fix lockdebug parsing of first_lkid It's unusual for first_lkid to be non-zero, wasn't being parsed properly. Signed-off-by: David Teigland --- dlm/tool/main.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlm/tool/main.c b/dlm/tool/main.c index d055b69..d091051 100644 --- a/dlm/tool/main.c +++ b/dlm/tool/main.c @@ -388,7 +388,7 @@ void do_leave(char *name) printf("done\n"); } -char *pr_master(int nodeid, uint32_t first_lkid) +char *pr_master(int nodeid, char *first_lkid) { static char buf[64]; @@ -399,7 +399,7 @@ char *pr_master(int nodeid, uint32_t first_lkid) else if (!nodeid) sprintf(buf, "Master"); else if (nodeid == -1) - sprintf(buf, "Lookup lkid %08x", first_lkid); + sprintf(buf, "Lookup lkid %s", first_lkid); return buf; } @@ -422,14 +422,15 @@ void print_rsb(char *line, struct rinfo *ri) { char type[4], namefmt[4], *p; char addr[64]; + char first_lkid[64]; int rv, nodeid, root_list, recover_list, recover_locks_count, namelen; - uint32_t first_lkid, flags; + uint32_t flags; - rv = sscanf(line, "%s %s %d %u %u %d %d %u %u %s", + rv = sscanf(line, "%s %s %d %s %u %d %d %u %u %s", type, addr, &nodeid, - &first_lkid, + first_lkid, &flags, &root_list, &recover_list,