Attachment 173601 Details for Bug 251180 – Proposed patch

[patch] Proposed patch

251180.gfs2.Werror (text/plain), 7.51 KB, created by Robert Peterson on 2007-08-27 14:32:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-08-27 14:32:07 UTC

Size: 7.51 KB

patch

obsolete

>Index: edit/hexedit.h
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/edit/hexedit.h,v
>retrieving revision 1.10
>diff -w -u -p -p -u -r1.10 hexedit.h
>--- edit/hexedit.h	16 Jul 2007 23:16:35 -0000	1.10
>+++ edit/hexedit.h	27 Aug 2007 14:28:07 -0000
>@@ -226,7 +226,6 @@ EXTERN enum dsp_mode dmode INIT(HEX_MODE
> 	__LINE__, __FILE__); \
> }
> 
>-#define pa(struct, member, count) print_array(#member, struct->member, count);
> #define printk printw
> 
> /*  Divide x by y.  Round up if there is a remainder.  */
>Index: fsck/Makefile
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/Makefile,v
>retrieving revision 1.13
>diff -w -u -p -p -u -r1.13 Makefile
>--- fsck/Makefile	15 Aug 2007 22:28:18 -0000	1.13
>+++ fsck/Makefile	27 Aug 2007 14:28:07 -0000
>@@ -35,7 +35,7 @@ OBJS=	eattr.o \
> 	util.o
> 
> CFLAGS += -D_FILE_OFFSET_BITS=64 -DHELPER_PROGRAM -DGFS_RELEASE_NAME=\"${RELEASE}\"
>-CFLAGS += -MMD -Wall -O2
>+CFLAGS += -MMD -Werror -O2
> CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
> CFLAGS += -I../include -I../libgfs2
> CFLAGS += -I${incdir}
>Index: fsck/pass1.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1.c,v
>retrieving revision 1.10
>diff -w -u -p -p -u -r1.10 pass1.c
>--- fsck/pass1.c	15 Aug 2007 22:28:18 -0000	1.10
>+++ fsck/pass1.c	27 Aug 2007 14:28:07 -0000
>@@ -253,7 +253,7 @@ static int check_eattr_leaf(struct gfs2_
> 			    void *private)
> {
> 	struct gfs2_sbd *sdp = ip->i_sbd;
>-	struct gfs2_buffer_head *leaf_bh;
>+	struct gfs2_buffer_head *leaf_bh = NULL;
> 	int ret = 0;
> 	struct gfs2_block_query q = {0};
> 	struct block_count *bc = (struct block_count *) private;
>Index: fsck/pass1b.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1b.c,v
>retrieving revision 1.5
>diff -w -u -p -p -u -r1.5 pass1b.c
>--- fsck/pass1b.c	28 Jun 2007 23:41:37 -0000	1.5
>+++ fsck/pass1b.c	27 Aug 2007 14:28:07 -0000
>@@ -464,7 +464,7 @@ int pass1b(struct gfs2_sbd *sbp)
> 	struct blocks *b;
> 	uint64_t i;
> 	struct gfs2_block_query q;
>-	osi_list_t *tmp;
>+	osi_list_t *tmp = NULL;
> 	struct metawalk_fxns find_dirents = {0};
> 	find_dirents.check_dentry = &find_dentry;
> 	int rc = 0;
>Index: include/gfs_ondisk.h
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/include/Attic/gfs_ondisk.h,v
>retrieving revision 1.1
>diff -w -u -p -p -u -r1.1 gfs_ondisk.h
>--- include/gfs_ondisk.h	22 Aug 2006 19:02:49 -0000	1.1
>+++ include/gfs_ondisk.h	27 Aug 2007 14:28:07 -0000
>@@ -717,31 +717,6 @@ uint32_t gfs_dir_hash(const char *data, 
> #define CPIN_64(s1, s2, member) {(s1->member) = gfs64_to_cpu((s2->member));}
> #define CPOUT_64(s1, s2, member) {(s2->member) = cpu_to_gfs64((s1->member));}
> 
>-#define pa(struct, member, count) print_array(#member, struct->member, count);
>-
>-/**
>- * print_array - Print out an array of bytes
>- * @title: what to print before the array
>- * @buf: the array
>- * @count: the number of bytes
>- *
>- */
>-
>-static void
>-print_array(char *title, char *buf, int count)
>-{
>-	int x;
>-
>-	printk("  %s =\n", title);
>-	for (x = 0; x < count; x++) {
>-		printk("%.2X ", (unsigned char)buf[x]);
>-		if (x % 16 == 15)
>-			printk("\n");
>-	}
>-	if (x % 16)
>-		printk("\n");
>-}
>-
> /**
>  * gfs_inum_in - Read in an inode number
>  * @no: the cpu-order structure
>@@ -945,8 +920,6 @@ gfs_sb_print(struct gfs_sb *sb)
> 
> 	gfs_inum_print(&sb->sb_quota_di);
> 	gfs_inum_print(&sb->sb_license_di);
>-
>-	pa(sb, sb_reserved, 96);
> }
> 
> /**
>@@ -999,8 +972,6 @@ gfs_jindex_print(struct gfs_jindex *ji)
> 	pv(ji, ji_addr, "%"PRIu64);
> 	pv(ji, ji_nsegment, "%u");
> 	pv(ji, ji_pad, "%u");
>-
>-	pa(ji, ji_reserved, 64);
> }
> 
> /**
>@@ -1068,8 +1039,6 @@ gfs_rindex_print(struct gfs_rindex *ri)
> 	pv(ri, ri_data, "%u");
> 
> 	pv(ri, ri_bitbytes, "%u");
>-
>-	pa(ri, ri_reserved, 64);
> }
> 
> /**
>@@ -1149,8 +1118,6 @@ gfs_rgrp_print(struct gfs_rgrp *rg)
> 
> 	pv(rg, rg_usedmeta, "%u");
> 	pv(rg, rg_freemeta, "%u");
>-
>-	pa(rg, rg_reserved, 64);
> }
> 
> /**
>@@ -1203,8 +1170,6 @@ gfs_quota_print(struct gfs_quota *quota)
> 	pv(quota, qu_limit, "%"PRIu64);
> 	pv(quota, qu_warn, "%"PRIu64);
> 	pv(quota, qu_value, "%"PRId64);
>-
>-	pa(quota, qu_reserved, 64);
> }
> 
> /**
>@@ -1347,8 +1312,6 @@ gfs_dinode_print(struct gfs_dinode *di)
> 	gfs_inum_print(&di->di_next_unused);
> 
> 	pv(di, di_eattr, "%"PRIu64);
>-
>-	pa(di, di_reserved, 56);
> }
> 
> /**
>@@ -1395,8 +1358,6 @@ void
> gfs_indirect_print(struct gfs_indirect *indirect)
> {
> 	gfs_meta_header_print(&indirect->in_header);
>-
>-	pa(indirect, in_reserved, 64);
> }
> 
> /**
>@@ -1459,8 +1420,6 @@ gfs_dirent_print(struct gfs_dirent *de, 
> 	pv(de, de_name_len, "%u");
> 	pv(de, de_type, "%u");
> 
>-	pa(de, de_reserved, 14);
>-
> 	memset(buf, 0, GFS_FNAMESIZE + 1);
> 	memcpy(buf, name, de->de_name_len);
> 	printk("  name = %s\n", buf);
>@@ -1525,8 +1484,6 @@ gfs_leaf_print(struct gfs_leaf *lf)
> 	pv(lf, lf_entries, "%u");
> 	pv(lf, lf_dirent_format, "%u");
> 	pv(lf, lf_next, "%"PRIu64);
>-
>-	pa(lf, lf_reserved, 64);
> }
> 
> /**
>@@ -1600,8 +1557,6 @@ gfs_log_header_print(struct gfs_log_head
> 
> 	pv(lh, lh_tail, "%"PRIu64);
> 	pv(lh, lh_last_dump, "%"PRIu64);
>-
>-	pa(lh, lh_reserved, 64);
> }
> 
> /**
>@@ -1663,8 +1618,6 @@ gfs_desc_print(struct gfs_log_descriptor
> 	pv(ld, ld_length, "%u");
> 	pv(ld, ld_data1, "%u");
> 	pv(ld, ld_data2, "%u");
>-
>-	pa(ld, ld_reserved, 64);
> }
> 
> /**
>Index: libgfs2/Makefile
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/Makefile,v
>retrieving revision 1.8
>diff -w -u -p -p -u -r1.8 Makefile
>--- libgfs2/Makefile	1 Jun 2007 09:45:34 -0000	1.8
>+++ libgfs2/Makefile	27 Aug 2007 14:28:08 -0000
>@@ -18,7 +18,7 @@ TARGET= libgfs2.a
> ## Bob: add -O2 back in and take -ggdb out
> CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
> CFLAGS += -D_GNU_SOURCE -DGFS2_RELEASE_NAME=\"${RELEASE}\"
>-CFLAGS += -Wall -ggdb
>+CFLAGS += -Werror -ggdb
> CFLAGS += -I${KERNEL_SRC}/fs/gfs2/ -I${KERNEL_SRC}/include/
> CFLAGS += -I../include
> CFLAGS += -I${incdir}
>Index: libgfs2/ondisk.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/ondisk.c,v
>retrieving revision 1.6
>diff -w -u -p -p -u -r1.6 ondisk.c
>--- libgfs2/ondisk.c	18 Jun 2007 21:35:58 -0000	1.6
>+++ libgfs2/ondisk.c	27 Aug 2007 14:28:08 -0000
>@@ -32,28 +32,6 @@
> #define CPIN_64(s1, s2, member) {(s1->member) = be64_to_cpu((s2->member));}
> #define CPOUT_64(s1, s2, member) {(s2->member) = cpu_to_be64((s1->member));}
> 
>-/**
>- * print_array - Print out an array of bytes
>- * @title: what to print before the array
>- * @buf: the array
>- * @count: the number of bytes
>- *
>- */
>-
>-static void print_array(char *title, unsigned char *buf, int count)
>-{
>-	int x;
>-
>-	printf("  %s =\n", title);
>-	for (x = 0; x < count; x++) {
>-		printf("%.2X ", (unsigned char)buf[x]);
>-		if (x % 16 == 15)
>-			printf("\n");
>-	}
>-	if (x % 16)
>-		printf("\n");
>-}
>-
> /*
>  * gfs2_xxx_in - read in an xxx struct
>  * first arg: the cpu-order structure
>Index: tool/main.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/tool/main.c,v
>retrieving revision 1.4
>diff -w -u -p -p -u -r1.4 main.c
>--- tool/main.c	5 May 2006 18:06:09 -0000	1.4
>+++ tool/main.c	27 Aug 2007 14:28:08 -0000
>@@ -225,9 +225,7 @@ main(int argc, char *argv[])
> 
> 	decode_arguments(argc, argv);
> 
>-	if (FALSE) {
>-		/* Do Nothing */
>-	} else if (strcmp(action, "clearflag") == 0)
>+	if (strcmp(action, "clearflag") == 0)
> 		set_flag(argc, argv);
> 	else if (strcmp(action, "counters") == 0)
> 		print_counters(argc, argv);

Actions: View | Diff

Attachments on bug 251180: 173601 | 224721 | 224731