CVSROOT: /cvs/cluster
Module name: cluster
Changes by: [EMAIL PROTECTED] 2007-10-11 20:27:49
Modified files:
gfs2/edit : savemeta.c
gfs2/fsck : lost_n_found.c
gfs2/libgfs2 : fs_ops.c ondisk.c super.c
gfs2/quota : main.c
gfs2/tool : main.c
Log message:
Resolves: bz 251180: Build time warnings for gfs2 userland tools
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/edit/savemeta.c.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/fsck/lost_n_found.c.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/fs_ops.c.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/ondisk.c.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/libgfs2/super.c.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/quota/main.c.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs2/tool/main.c.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- cluster/gfs2/edit/savemeta.c 2007/07/16 23:16:35 1.2
+++ cluster/gfs2/edit/savemeta.c 2007/10/11 20:27:48 1.3
@@ -282,7 +282,7 @@
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;
@@ -620,11 +620,11 @@
uint64_t buf64, writes = 0;
uint16_t buf16;
int first = 1;
- uint64_t max_fs_size;
do_lseek(fd, 0);
blks_saved = 0;
total_out = 0;
+ last_fs_block = 0;
while (TRUE) {
memset(savedata, 0, sizeof(struct saved_metablock));
rs = read(in_fd, &buf64, sizeof(uint64_t));
@@ -635,11 +635,11 @@
return -1;
}
savedata->blk = be64_to_cpu(buf64);
- if (savedata->blk >= max_fs_size) {
+ if (last_fs_block && savedata->blk >= last_fs_block) {
fprintf(stderr, "Error: File system is too small to "
"restore this metadata.\n");
fprintf(stderr, "File system is %" PRIu64 " blocks, ",
- max_fs_size);
+ last_fs_block);
fprintf(stderr, "Restore block = %" PRIu64 "\n",
savedata->blk);
return -1;
--- cluster/gfs2/fsck/lost_n_found.c 2006/06/12 20:41:43 1.3
+++ cluster/gfs2/fsck/lost_n_found.c 2007/10/11 20:27:48 1.4
@@ -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 @@
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;
}
--- cluster/gfs2/libgfs2/fs_ops.c 2007/09/24 23:16:34 1.12
+++ cluster/gfs2/libgfs2/fs_ops.c 2007/10/11 20:27:48 1.13
@@ -1363,7 +1363,7 @@
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 @@
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 @@
if(!found)
return 1;
- dirent2_del(dip, bh, prev, cur);
- brelse(bh, updated);
+ if (bh) {
+ dirent2_del(dip, bh, prev, cur);
+ brelse(bh, updated);
+ }
return 0;
}
--- cluster/gfs2/libgfs2/ondisk.c 2007/08/24 06:08:26 1.7
+++ cluster/gfs2/libgfs2/ondisk.c 2007/10/11 20:27:48 1.8
@@ -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
--- cluster/gfs2/libgfs2/super.c 2007/06/26 01:25:33 1.5
+++ cluster/gfs2/libgfs2/super.c 2007/10/11 20:27:48 1.6
@@ -179,7 +179,7 @@
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;
--- cluster/gfs2/quota/main.c 2007/08/24 06:08:26 1.8
+++ cluster/gfs2/quota/main.c 2007/10/11 20:27:49 1.9
@@ -255,24 +255,24 @@
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 @@
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);
}
--- cluster/gfs2/tool/main.c 2007/08/22 08:58:46 1.5
+++ cluster/gfs2/tool/main.c 2007/10/11 20:27:49 1.6
@@ -225,9 +225,7 @@
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);
