public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: David Teigland <teigland@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: dlm: master - dlm_tool: fix lockdebug parsing of first_lkid Date: Wed, 11 Mar 2009 21:10:00 -0000 [thread overview] Message-ID: <20090311211005.5371712033E@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=140561b3523713b1faff87dc76f2e21d88adc2b4 Commit: 140561b3523713b1faff87dc76f2e21d88adc2b4 Parent: e439913942becf6820cb653246513131c34f6155 Author: David Teigland <teigland@redhat.com> AuthorDate: Wed Mar 11 16:05:08 2009 -0500 Committer: David Teigland <teigland@redhat.com> CommitterDate: Wed Mar 11 16:06:43 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 <teigland@redhat.com> --- 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,
reply other threads:[~2009-03-11 21:10 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090311211005.5371712033E@lists.fedorahosted.org \ --to=teigland@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).