Attachment 224731 Details for Bug 251180 – Patch for RHEL5 branch of CVS

[patch] Patch for RHEL5 branch of CVS

251180.buildwarn.RHEL5.patch (text/plain), 12.35 KB, created by Robert Peterson on 2007-10-11 20:18:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-10-11 20:18:24 UTC

Size: 12.35 KB

patch

obsolete

>Index: edit/hexedit.h
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/edit/hexedit.h,v
>retrieving revision 1.4.2.3
>diff -w -u -p -p -u -r1.4.2.3 hexedit.h
>--- edit/hexedit.h	26 Jun 2007 01:40:43 -0000	1.4.2.3
>+++ edit/hexedit.h	11 Oct 2007 20:03:13 -0000
>@@ -223,7 +223,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: edit/savemeta.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/edit/savemeta.c,v
>retrieving revision 1.1.2.1
>diff -w -u -p -p -u -r1.1.2.1 savemeta.c
>--- edit/savemeta.c	26 Jun 2007 01:53:19 -0000	1.1.2.1
>+++ edit/savemeta.c	11 Oct 2007 20:03:14 -0000
>@@ -282,7 +282,7 @@ int gfs1_rindex_read(struct gfs2_sbd *sd
> 	int error;
> 	struct gfs2_rindex buf;
> 	struct rgrp_list *rgd, *prev_rgd;
>-	uint64_t prev_length;
>+	uint64_t prev_length = 0;
> 
> 	*count1 = 0;
> 	prev_rgd = NULL;
>Index: fsck/lost_n_found.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/lost_n_found.c,v
>retrieving revision 1.3
>diff -w -u -p -p -u -r1.3 lost_n_found.c
>--- fsck/lost_n_found.c	12 Jun 2006 20:41:43 -0000	1.3
>+++ fsck/lost_n_found.c	11 Oct 2007 20:03:14 -0000
>@@ -15,7 +15,6 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>-#include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
> #include <dirent.h>
>@@ -94,35 +93,35 @@ int add_inode_to_lf(struct gfs2_inode *i
> 
> 		dir_add(ip, filename, filename_len, &(lf_dip->i_di.di_num), DT_DIR);
> 		free(filename);
>-		sprintf(tmp_name, "lost_dir_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_dir_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_DIR;
> 		break;
> 	case S_IFREG:
>-		sprintf(tmp_name, "lost_file_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_file_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_REG;
> 		break;
> 	case S_IFLNK:
>-		sprintf(tmp_name, "lost_link_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_link_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_LNK;
> 		break;
> 	case S_IFBLK:
>-		sprintf(tmp_name, "lost_blkdev_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_blkdev_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_BLK;
> 		break;
> 	case S_IFCHR:
>-		sprintf(tmp_name, "lost_chrdev_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_chrdev_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_CHR;
> 		break;
> 	case S_IFIFO:
>-		sprintf(tmp_name, "lost_fifo_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_fifo_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_FIFO;
> 		break;
> 	case S_IFSOCK:
>-		sprintf(tmp_name, "lost_socket_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_socket_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_SOCK;
> 		break;
> 	default:
>-		sprintf(tmp_name, "lost_%"PRIu64, ip->i_di.di_num.no_addr);
>+		sprintf(tmp_name, "lost_%llu", ip->i_di.di_num.no_addr);
> 		inode_type = DT_REG;
> 		break;
> 	}
>Index: fsck/pass1.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/fsck/pass1.c,v
>retrieving revision 1.4.2.6
>diff -w -u -p -p -u -r1.4.2.6 pass1.c
>--- fsck/pass1.c	15 Aug 2007 22:31:00 -0000	1.4.2.6
>+++ fsck/pass1.c	11 Oct 2007 20:03:14 -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.3.2.3
>diff -w -u -p -p -u -r1.3.2.3 pass1b.c
>--- fsck/pass1b.c	18 Sep 2007 18:14:27 -0000	1.3.2.3
>+++ fsck/pass1b.c	11 Oct 2007 20:03:14 -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	11 Oct 2007 20:03:14 -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
>@@ -946,7 +921,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 +973,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 +1040,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 +1119,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 +1171,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 +1313,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 +1359,6 @@ void
> gfs_indirect_print(struct gfs_indirect *indirect)
> {
> 	gfs_meta_header_print(&indirect->in_header);
>-
>-	pa(indirect, in_reserved, 64);
> }
> 
> /**
>@@ -1459,8 +1421,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 +1485,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 +1558,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 +1619,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/fs_ops.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/fs_ops.c,v
>retrieving revision 1.4.2.8
>diff -w -u -p -p -u -r1.4.2.8 fs_ops.c
>--- libgfs2/fs_ops.c	24 Sep 2007 23:17:41 -0000	1.4.2.8
>+++ libgfs2/fs_ops.c	11 Oct 2007 20:03:14 -0000
>@@ -1363,7 +1363,7 @@ static int linked_leaf_search(struct gfs
> static int dir_e_search(struct gfs2_inode *dip, const char *filename,
> 						int len, unsigned int *type, struct gfs2_inum *inum)
> {
>-	struct gfs2_buffer_head *bh;
>+	struct gfs2_buffer_head *bh = NULL;
> 	struct gfs2_dirent *dent;
> 	int error;
> 
>@@ -1445,7 +1445,7 @@ static int dir_e_del(struct gfs2_inode *
> 	int error;
> 	int found = 0;
> 	uint64_t leaf_no;
>-	struct gfs2_buffer_head *bh;
>+	struct gfs2_buffer_head *bh = NULL;
> 	struct gfs2_dirent *cur, *prev;
> 
> 	index = (1 << (dip->i_di.di_depth))-1;
>@@ -1471,8 +1471,10 @@ static int dir_e_del(struct gfs2_inode *
> 	if(!found)
> 		return 1;
> 
>+	if (bh) {
> 	dirent2_del(dip, bh, prev, cur);
> 	brelse(bh, updated);
>+	}
> 	return 0;
> }
> 
>Index: libgfs2/ondisk.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/ondisk.c,v
>retrieving revision 1.5.2.2
>diff -w -u -p -p -u -r1.5.2.2 ondisk.c
>--- libgfs2/ondisk.c	24 Aug 2007 06:08:21 -0000	1.5.2.2
>+++ libgfs2/ondisk.c	11 Oct 2007 20:03:14 -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: libgfs2/super.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/libgfs2/super.c,v
>retrieving revision 1.3.2.2
>diff -w -u -p -p -u -r1.3.2.2 super.c
>--- libgfs2/super.c	26 Jun 2007 01:40:43 -0000	1.3.2.2
>+++ libgfs2/super.c	11 Oct 2007 20:03:15 -0000
>@@ -179,7 +179,7 @@ int rindex_read(struct gfs2_sbd *sdp, in
> 	int error;
> 	struct gfs2_rindex buf;
> 	struct rgrp_list *rgd, *prev_rgd;
>-	uint64_t prev_length;
>+	uint64_t prev_length = 0;
> 
> 	*count1 = 0;
> 	prev_rgd = NULL;
>Index: quota/main.c
>===================================================================
>RCS file: /cvs/cluster/cluster/gfs2/quota/main.c,v
>retrieving revision 1.2.2.5
>diff -w -u -p -p -u -r1.2.2.5 main.c
>--- quota/main.c	24 Aug 2007 06:08:21 -0000	1.2.2.5
>+++ quota/main.c	11 Oct 2007 20:03:15 -0000
>@@ -255,24 +255,24 @@ print_quota(commandline_t *comline,
> 
> 	case GQ_UNITS_KILOBYTE:
> 		if (sb->sb_bsize == 512)
>-			printf("limit: %-10"PRIu64" warn: %-10"PRIu64"value: %-10"PRId64"\n",
>+			printf("limit: %-10llu warn: %-10lluvalue: %-10llu\n",
> 			       q->qu_limit / 2,
> 			       q->qu_warn / 2,
> 			       q->qu_value / 2);
> 		else
>-			printf("limit: %-10"PRIu64" warn: %-10"PRIu64"value: %-10"PRId64"\n",
>+			printf("limit: %-10llu warn: %-10lluvalue: %-10llu\n",
> 			       q->qu_limit << (sb->sb_bsize_shift - 10),
> 			       q->qu_warn << (sb->sb_bsize_shift - 10),
> 			       q->qu_value << (sb->sb_bsize_shift - 10));
> 		break;
> 
> 	case GQ_UNITS_FSBLOCK:
>-		printf("limit: %-10"PRIu64" warn: %-10"PRIu64" value: %-10"PRId64"\n",
>+		printf("limit: %-10llu warn: %-10llu value: %-10llu\n",
> 		       q->qu_limit, q->qu_warn, q->qu_value);
> 		break;
> 
> 	case GQ_UNITS_BASICBLOCK:
>-		printf("limit: %-10"PRIu64" warn: %-10"PRIu64" value: %-10"PRId64"\n",
>+		printf("limit: %-10llu warn: %-10llu value: %-10llu\n",
> 		       q->qu_limit << (sb->sb_bsize_shift - 9),
> 		       q->qu_warn << (sb->sb_bsize_shift - 9),
> 		       q->qu_value << (sb->sb_bsize_shift - 9));
>@@ -319,8 +319,8 @@ read_quota_internal(int fd, uint32_t id,
> 	if (error < 0)
> 		die("failed to read from quota file: %s\n", strerror(errno));
> 	if (error != sizeof(struct gfs2_quota))
>-		die("Couldn't read %d bytes from quota file at offset %llu\n",
>-		    sizeof(struct gfs2_quota), offset);
>+		die("Couldn't read %lu bytes from quota file at offset %llu\n",
>+		    sizeof(struct gfs2_quota), (unsigned long long)offset);
> 	gfs2_quota_in(q, buf);
> }
> 
>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	11 Oct 2007 20:03:15 -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