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

login
register
mail settings
Submitter Nick Dokos
Date April 18, 2009, 6:05 a.m.
Message ID <30393.1240034704@gamaville.dokosmarshall.org>
Download mbox | patch
Permalink /patch/26148/
State Superseded
Headers show

Comments

Nick Dokos - April 18, 2009, 6:05 a.m.
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(-)
Eric Sandeen - April 18, 2009, 1:29 p.m.
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;
>  

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Valerie Aurora Henson - April 21, 2009, 12:49 a.m.
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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;