[Ocfs2-tools-devel] [patch 05/11] modify some places which call ocfs2_extent_map_get_blocks

[tao.ma at oracle.com]

One parameter of ocf2_etent_map_get_blocks has been changed from int to uint64_t since it is a bug. So modify all the caller.
Index: test.ocfs2-tools/fsck.ocfs2/journal.c
===================================================================
--- test.ocfs2-tools.orig/fsck.ocfs2/journal.c	2007-08-16 00:27:41.000000000 -0400
+++ test.ocfs2-tools/fsck.ocfs2/journal.c	2007-08-16 00:36:28.000000000 -0400
@@ -238,7 +238,7 @@ static errcode_t lookup_journal_block(oc
 				      int check_dup)
 {
 	errcode_t ret;
-	int contig;
+	uint64_t contig;
 	int was_set;
 
 	ret = ocfs2_extent_map_get_blocks(ji->ji_cinode, blkoff, 1, blkno,
@@ -529,7 +529,8 @@ errcode_t o2fsck_should_replay_journals(
 	uint64_t blkno;
 	errcode_t ret;
 	ocfs2_cached_inode *cinode = NULL;
-	int contig, is_dirty;
+	int is_dirty;
+	uint64_t contig;
 	journal_superblock_t *jsb;
 
 	*should = 0;
Index: test.ocfs2-tools/fswreck/dir.c
===================================================================
--- test.ocfs2-tools.orig/fswreck/dir.c	2007-08-16 00:27:44.000000000 -0400
+++ test.ocfs2-tools/fswreck/dir.c	2007-08-16 00:36:28.000000000 -0400
@@ -134,7 +134,7 @@ static void damage_dir_content(ocfs2_fil
 	errcode_t ret;
 	char *buf = NULL;
 	uint64_t blkno, tmp_blkno;
-	int contig;
+	uint64_t contig;
 	ocfs2_cached_inode *cinode = NULL;
 	struct ocfs2_dir_entry *de = NULL, *newent = NULL;
 	char name[OCFS2_MAX_FILENAME_LEN];
@@ -336,7 +336,7 @@ void mess_up_dir_ent(ocfs2_filesys *fs, 
 void mess_up_dir_parent_dup(ocfs2_filesys *fs, uint64_t blkno)
 {
 	errcode_t ret;
-	int contig;
+	uint64_t contig;
 	uint64_t parent1, parent2, tmp_blkno,extblk;
 	char *buf = NULL;
 	struct ocfs2_dir_entry *de = NULL, *newent = NULL;
Index: test.ocfs2-tools/libocfs2/dir_scan.c
===================================================================
--- test.ocfs2-tools.orig/libocfs2/dir_scan.c	2007-08-16 00:27:42.000000000 -0400
+++ test.ocfs2-tools/libocfs2/dir_scan.c	2007-08-16 00:36:28.000000000 -0400
@@ -50,7 +50,7 @@ static errcode_t get_more_dir_blocks(ocf
 {
 	errcode_t ret;
 	uint64_t blkno;
-	int cblocks;
+	uint64_t cblocks;
 
 	if (scan->blocks_read == scan->total_blocks)
 		return OCFS2_ET_ITERATION_COMPLETE;
Index: test.ocfs2-tools/libocfs2/expanddir.c
===================================================================
--- test.ocfs2-tools.orig/libocfs2/expanddir.c	2007-08-16 00:27:42.000000000 -0400
+++ test.ocfs2-tools/libocfs2/expanddir.c	2007-08-16 00:36:28.000000000 -0400
@@ -50,7 +50,7 @@ errcode_t ocfs2_expand_dir(ocfs2_filesys
 	uint64_t used_blks;
 	uint64_t totl_blks;
 	uint64_t new_blk;
-	int contig;
+	uint64_t contig;
 	char *buf = NULL;
 
 	if (!(fs->fs_flags & OCFS2_FLAG_RW))

--