This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: master - dlm_tool: change to new debugfs scan
- From: David Teigland <teigland at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 23 Dec 2008 16:16:07 +0000 (UTC)
- Subject: cluster: master - dlm_tool: change to new debugfs scan
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=08b52461b25f45cf6b7bfa4f9a0f1cca32943be6
Commit: 08b52461b25f45cf6b7bfa4f9a0f1cca32943be6
Parent: 8aaa008dd6f3390644b695e7989b834471592f9b
Author: David Teigland <teigland@redhat.com>
AuthorDate: Tue Dec 23 10:59:57 2008 -0600
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Tue Dec 23 11:01:33 2008 -0600
dlm_tool: change to new debugfs scan
The rsb addr was added to the output.
Signed-off-by: David Teigland <teigland@redhat.com>
---
dlm/tool/main.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index a31656b..6d1f53a 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -384,11 +384,13 @@ char *pr_recovery(uint32_t flags, int root_list, int recover_list,
void print_rsb(char *line)
{
char type[4], namefmt[4], *p;
+ char addr[64];
int rv, nodeid, root_list, recover_list, recover_locks_count, namelen;
uint32_t first_lkid, flags;
- rv = sscanf(line, "%s %d %u %u %d %d %u %u %s",
+ rv = sscanf(line, "%s %s %d %u %u %d %d %u %u %s",
type,
+ addr,
&nodeid,
&first_lkid,
&flags,
@@ -398,7 +400,7 @@ void print_rsb(char *line)
&namelen,
namefmt);
- if (rv != 9)
+ if (rv != 10)
goto fail;
/* used for lkb prints */
@@ -414,6 +416,8 @@ void print_rsb(char *line)
goto fail;
p += 4;
+ strcat(addr, " ");
+
if (!strncmp(namefmt, "str", 3))
printf("Resource len %2d \"%s\"\n", namelen, p);
else if (!strncmp(namefmt, "hex", 3))
@@ -641,7 +645,6 @@ void do_lockdebug(char *name)
raw:
printf("%s", line);
}
- out:
fclose(file);
}