[PATCH 1/2][64-BIT] blk_t -> blk64_t in read_bitmaps().

[PATCH 1/2][64-BIT] blk_t -> blk64_t in read_bitmaps().

[Nick Dokos]

e2fsck -n -f on a brand-new, never-mounted 32TiB filesystem was
detecting a lot of "Block bitmap differences". This change makes them
go away (there are are still more problems however: the run finds used
blocks in one BLOCK_UNINIT group and a free block mismatch.)

Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>
---
 lib/ext2fs/rw_bitmaps.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index cee6142..5b504bf 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -144,9 +144,9 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
 	int csum_flag = 0;
 	int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
 	unsigned int	cnt;
-	blk_t	blk;
-	blk_t	blk_itr = fs->super->s_first_data_block;
-	blk_t   blk_cnt;
+	blk64_t	blk;
+	blk64_t	blk_itr = fs->super->s_first_data_block;
+	blk64_t   blk_cnt;
 	ext2_ino_t ino_itr = 1;
 	ext2_ino_t ino_cnt;
 
-- 
1.6.0.6

Re: [PATCH 1/2][64-BIT] blk_t -> blk64_t in read_bitmaps().

[Eric Sandeen]

Nick Dokos wrote:
> e2fsck -n -f on a brand-new, never-mounted 32TiB filesystem was
> detecting a lot of "Block bitmap differences". This change makes them
> go away (there are are still more problems however: the run finds used
> blocks in one BLOCK_UNINIT group and a free block mismatch.)
> 
> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>

Looks right to me as well.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  lib/ext2fs/rw_bitmaps.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
> index cee6142..5b504bf 100644
> --- a/lib/ext2fs/rw_bitmaps.c
> +++ b/lib/ext2fs/rw_bitmaps.c
> @@ -144,9 +144,9 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
>  	int csum_flag = 0;
>  	int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
>  	unsigned int	cnt;
> -	blk_t	blk;
> -	blk_t	blk_itr = fs->super->s_first_data_block;
> -	blk_t   blk_cnt;
> +	blk64_t	blk;
> +	blk64_t	blk_itr = fs->super->s_first_data_block;
> +	blk64_t   blk_cnt;
>  	ext2_ino_t ino_itr = 1;
>  	ext2_ino_t ino_cnt;
>  

Re: [PATCH 1/2][64-BIT] blk_t -> blk64_t in read_bitmaps().

[Valerie Aurora Henson]

On Sat, Apr 18, 2009 at 02:05:04AM -0400, Nick Dokos wrote:
> e2fsck -n -f on a brand-new, never-mounted 32TiB filesystem was
> detecting a lot of "Block bitmap differences". This change makes them
> go away (there are are still more problems however: the run finds used
> blocks in one BLOCK_UNINIT group and a free block mismatch.)
> 
> Signed-off-by: Nick Dokos <nicholas.dokos@hp.com>

Signed-off-by: Valerie Aurora (Henson) <vaurora@redhat.com>

Pulled and pushed.

-VAL

> ---
>  lib/ext2fs/rw_bitmaps.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
> index cee6142..5b504bf 100644
> --- a/lib/ext2fs/rw_bitmaps.c
> +++ b/lib/ext2fs/rw_bitmaps.c
> @@ -144,9 +144,9 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
>  	int csum_flag = 0;
>  	int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
>  	unsigned int	cnt;
> -	blk_t	blk;
> -	blk_t	blk_itr = fs->super->s_first_data_block;
> -	blk_t   blk_cnt;
> +	blk64_t	blk;
> +	blk64_t	blk_itr = fs->super->s_first_data_block;
> +	blk64_t   blk_cnt;
>  	ext2_ino_t ino_itr = 1;
>  	ext2_ino_t ino_cnt;
>  
> -- 
> 1.6.0.6
>