2009-04-18 06:10:40

by Nick Dokos

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

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 <[email protected]>
---
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

2009-04-18 13:29:22

by Eric Sandeen

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

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 <[email protected]>

Looks right to me as well.

Reviewed-by: Eric Sandeen <[email protected]>

> ---
> 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;
>

2009-04-21 00:49:40

by Valerie Aurora

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

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 <[email protected]>

Signed-off-by: Valerie Aurora (Henson) <[email protected]>

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
>