Attachment 157335 Details for Bug 244163 – patch to fix the problem

[patch] patch to fix the problem

244163.patch.rhel5 (text/plain), 2.06 KB, created by Robert Peterson on 2007-06-18 21:53:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-06-18 21:53:29 UTC

Size: 2.06 KB

patch

obsolete

>Index: libgfs2/libgfs2.h
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/libgfs2.h,v
>retrieving revision 1.7.2.6
>diff -w -u -p -p -u -r1.7.2.6 libgfs2.h
>--- libgfs2/libgfs2.h	15 May 2007 18:21:08 -0000	1.7.2.6
>+++ libgfs2/libgfs2.h	18 Jun 2007 21:41:56 -0000
>@@ -546,7 +546,7 @@ uint32_t gfs2_disk_hash(const char *data
> extern void print_it(const char *label, const char *fmt,
> 					 const char *fmt2, ...);
> #define pv(struct, member, fmt, fmt2) do {				   \
>-		print_it("  "#member":", fmt, fmt2, struct->member); \
>+		print_it("  "#member, fmt, fmt2, struct->member); \
>         } while (FALSE);
> #define pv2(struct, member, fmt, fmt2) do {		 \
> 		print_it("  ", fmt, fmt2, struct->member);	\
>Index: libgfs2/ondisk.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/ondisk.c,v
>retrieving revision 1.5
>diff -w -u -p -p -u -r1.5 ondisk.c
>--- libgfs2/ondisk.c	14 Jun 2006 13:55:11 -0000	1.5
>+++ libgfs2/ondisk.c	18 Jun 2007 21:41:56 -0000
>@@ -167,8 +167,8 @@ void gfs2_sb_print(struct gfs2_sb *sb)
> 	gfs2_inum_print(&sb->sb_master_dir);
> 	gfs2_inum_print(&sb->sb_root_dir);
> 
>-	pv(sb, sb_lockproto, "%s", "0x%x");
>-	pv(sb, sb_locktable, "%s", "0x%x");
>+	pv(sb, sb_lockproto, "%s", NULL);
>+	pv(sb, sb_locktable, "%s", NULL);
> }
> 
> void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
>Index: tool/sb.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/tool/sb.c,v
>retrieving revision 1.2
>diff -w -u -p -p -u -r1.2 sb.c
>--- tool/sb.c	5 May 2006 18:06:09 -0000	1.2
>+++ tool/sb.c	18 Jun 2007 21:41:56 -0000
>@@ -36,11 +36,12 @@ extern void gfs2_sb_print(struct gfs2_sb
> extern int gfs2_sb_out(struct gfs2_sb *sb, char *buf);
> 
> 
>-void print_it(const char *label, const char *fmt, ...)
>+void print_it(const char *label, const char *fmt, const char *fmt2, ...)
> {
> 	va_list args;
>-	va_start(args, fmt);
>-	printf("%s", label);
>+
>+	va_start(args, fmt2);
>+	printf("%s = ", label);
> 	vprintf(fmt, args);
> 	printf("\n");
> 	va_end(args);

Actions: View | Diff

Attachments on bug 244163: 157335