[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.04-18-g33eb572



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=33eb5724d102b7db2d5370623343ae2e74d46edb

The branch, master has been updated
       via  33eb5724d102b7db2d5370623343ae2e74d46edb (commit)
      from  4770c30eb41d85c6991e1d40b5cd2b906a8e271e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 33eb5724d102b7db2d5370623343ae2e74d46edb
Author: Bob Peterson <rpeterso redhat com>
Date:   Thu Jun 12 10:48:08 2008 -0500

    Fix build warnings from libgfs

-----------------------------------------------------------------------

Summary of changes:
 gfs/libgfs/file.c     |    2 +-
 gfs/libgfs/fs_bits.c  |    6 +++---
 gfs/libgfs/fs_dir.c   |    6 +++---
 gfs/libgfs/fs_inode.c |    2 +-
 gfs/libgfs/log.c      |    8 ++++----
 gfs/libgfs/rgrp.c     |    8 ++++++--
 gfs/libgfs/util.c     |    6 +++---
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/gfs/libgfs/file.c b/gfs/libgfs/file.c
index dad8c82..ff1dd2a 100644
--- a/gfs/libgfs/file.c
+++ b/gfs/libgfs/file.c
@@ -214,7 +214,7 @@ int writei(int disk_fd, struct gfs_inode *ip, void *buf, uint64_t offset,
 		ip->i_di.di_size = start + copied;
 	ip->i_di.di_mtime = ip->i_di.di_ctime = osi_current_time();
 
-	gfs_dinode_out(&ip->i_di, BH_DATA(dibh));
+	gfs_dinode_out(&ip->i_di, (char *)BH_DATA(dibh));
 	write_buf(disk_fd, dibh, 0);
 	relse_buf(dibh);
 
diff --git a/gfs/libgfs/fs_bits.c b/gfs/libgfs/fs_bits.c
index 6f4f857..3509763 100644
--- a/gfs/libgfs/fs_bits.c
+++ b/gfs/libgfs/fs_bits.c
@@ -276,8 +276,8 @@ int fs_get_bitmap(int disk_fd, struct gfs_sbd *sdp, uint64 blkno, struct gfs_rgr
 		return -1;
 	}
 
-	byte = (BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset) +
-		(rgrp_block/GFS_NBBY - bits->bi_start);
+	byte = (unsigned char *)((BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset) +
+				 (rgrp_block/GFS_NBBY - bits->bi_start));
 	bit = (rgrp_block % GFS_NBBY) * GFS_BIT_SIZE;
 
 	val = ((*byte >> bit) & GFS_BIT_MASK);
@@ -332,7 +332,7 @@ int fs_set_bitmap(int disk_fd, struct gfs_sbd *sdp, uint64 blkno, int state)
 		}
 	}
 
-	fs_setbit(BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset,
+	fs_setbit((unsigned char *)BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset,
 		  bits->bi_len,
 		  (rgrp_block - (bits->bi_start*GFS_NBBY)),
 		  state);
diff --git a/gfs/libgfs/fs_dir.c b/gfs/libgfs/fs_dir.c
index 0526fa6..0d704d4 100644
--- a/gfs/libgfs/fs_dir.c
+++ b/gfs/libgfs/fs_dir.c
@@ -2,7 +2,7 @@
 #include "link.h"
 #include "libgfs.h"
 
-#define dir_hash(qstr) (gfs_dir_hash((qstr)->name, (qstr)->len))
+#define dir_hash(qstr) (gfs_dir_hash((char *)(qstr)->name, (qstr)->len))
 
 /* Detect directory is a stuffed inode */
 int gfs_inode_is_stuffed(struct gfs_inode *ip)
@@ -144,7 +144,7 @@ int dirent_del(int disk_fd, struct gfs_inode *dip, osi_buf_t *bh,
 		return -1;
 	}
 
-	if((char *)cur + cur_rec_len > BH_DATA(bh) + BH_SIZE(bh)){
+	if((char *)(cur) + cur_rec_len > BH_DATA(bh) + BH_SIZE(bh)){
 		log_err("dirent_del: Directory entry has record length"
 			" longer than buffer.\n");
 		return -1;
@@ -444,7 +444,7 @@ static int linked_leaf_search(int disk_fd, struct gfs_inode *dip,
 static int dir_e_search(int disk_fd, struct gfs_inode *dip,
 						identifier_t *id, unsigned int *type)
 {
-	osi_buf_t *bh;
+	osi_buf_t *bh = NULL;
 	struct gfs_dirent *dent;
 	int error;
 
diff --git a/gfs/libgfs/fs_inode.c b/gfs/libgfs/fs_inode.c
index 1590364..51f6e9b 100644
--- a/gfs/libgfs/fs_inode.c
+++ b/gfs/libgfs/fs_inode.c
@@ -371,7 +371,7 @@ int fs_mkdir(int disk_fd, struct gfs_inode *dip, char *new_dir,
 	osi_filename_t name;
 	int new;
 
-	name.name = new_dir;
+	name.name = (unsigned char *)new_dir;
 	name.len = strlen(new_dir);
 	creds.cr_uid = getuid();
 	creds.cr_gid = getgid();
diff --git a/gfs/libgfs/log.c b/gfs/libgfs/log.c
index 977e25b..52e0942 100644
--- a/gfs/libgfs/log.c
+++ b/gfs/libgfs/log.c
@@ -98,7 +98,7 @@ int query(struct options *opts, const char *format, ...)
 			log_debug("Error in select() on stdin\n");
 			break;
 		}
-		read(STDIN_FILENO, &response, sizeof(char));
+		err = read(STDIN_FILENO, &response, sizeof(char));
 
 	}
  query:
@@ -108,7 +108,7 @@ int query(struct options *opts, const char *format, ...)
 	fflush(NULL);
 
  rescan:
-	read(STDIN_FILENO, &response, sizeof(char));
+	err = read(STDIN_FILENO, &response, sizeof(char));
 
 	if(tolower(response) == 'y') {
 		ret = 1;
@@ -118,7 +118,7 @@ int query(struct options *opts, const char *format, ...)
 		goto rescan;
 	} else {
 		while(response != '\n')
-			read(STDIN_FILENO, &response, sizeof(char));
+			err = read(STDIN_FILENO, &response, sizeof(char));
 		printf("Bad response, please type 'y' or 'n'.\n");
 		goto query;
 	}
@@ -129,7 +129,7 @@ int query(struct options *opts, const char *format, ...)
 			log_debug("Error in select() on stdin\n");
 			break;
 		}
-		read(STDIN_FILENO, &response, sizeof(char));
+		err = read(STDIN_FILENO, &response, sizeof(char));
 	}
 
 	return ret;
diff --git a/gfs/libgfs/rgrp.c b/gfs/libgfs/rgrp.c
index a9540b7..6407b80 100644
--- a/gfs/libgfs/rgrp.c
+++ b/gfs/libgfs/rgrp.c
@@ -227,7 +227,9 @@ int fs_rgrp_verify(struct gfs_rgrpd *rgd)
 
 		for (buf = 0; buf < length; buf++){
 			bits = &rgd->rd_bits[buf];
-			count[x] += fs_bitcount(BH_DATA(rgd->rd_bh[buf]) + bits->bi_offset,
+			count[x] += fs_bitcount((unsigned char *)
+						BH_DATA(rgd->rd_bh[buf]) +
+						bits->bi_offset,
 						bits->bi_len, x);
 		}
 	}
@@ -285,7 +287,9 @@ int fs_rgrp_recount(int disk_fd, struct gfs_rgrpd *rgd){
 		count[i] = 0;
 		for(j = 0; j < length; j++){
 			bits = (fs_bitmap_t *)&rgd->rd_bits[j];
-			count[i] += fs_bitcount(BH_DATA(rgd->rd_bh[j]) + bits->bi_offset,
+			count[i] += fs_bitcount((unsigned char *)
+						BH_DATA(rgd->rd_bh[j]) +
+						bits->bi_offset,
 						bits->bi_len, i);
 		}
 	}
diff --git a/gfs/libgfs/util.c b/gfs/libgfs/util.c
index 2e1a03d..6e1b34c 100644
--- a/gfs/libgfs/util.c
+++ b/gfs/libgfs/util.c
@@ -152,7 +152,7 @@ int next_rg_meta(struct gfs_rgrpd *rgd, uint64 *block, int first)
   for(; i < length; i++){
     bits = &rgd->rd_bits[i];
 
-    blk = fs_bitfit(BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
+    blk = fs_bitfit((unsigned char *)BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
                     bits->bi_len, blk, GFS_BLKST_USEDMETA);
 
     if(blk != BFITNOENT){
@@ -205,10 +205,10 @@ int next_rg_meta_free(struct gfs_rgrpd *rgd, uint64 *block, int first, int *mfre
   for(; i < length; i++){
     bits = &rgd->rd_bits[i];
 
-    ublk = fs_bitfit(BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
+    ublk = fs_bitfit((unsigned char *)BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
                     bits->bi_len, blk, GFS_BLKST_USEDMETA);
 
-    fblk = fs_bitfit(BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
+    fblk = fs_bitfit((unsigned char *)BH_DATA(rgd->rd_bh[i]) + bits->bi_offset,
 			     bits->bi_len, blk, GFS_BLKST_FREEMETA);
     if(ublk < fblk) {
 	    blk = ublk;


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]