2009-05-01 08:46:18

by Nick Dokos

Subject: [PATCH 2/6] [64-bit] write_bitmaps(): blk_t -> blk64_t

write_bitmaps() was truncating blocks numbers to 32 bits and therefore
writing at the wrong place on the disk.

Signed-off-by: Nick Dokos <[email protected]>
---
lib/ext2fs/rw_bitmaps.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
index 5b504bf..da472a8 100644
--- a/lib/ext2fs/rw_bitmaps.c
+++ b/lib/ext2fs/rw_bitmaps.c
@@ -36,8 +36,8 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
errcode_t retval;
char *block_buf, *inode_buf;
int csum_flag = 0;
- blk_t blk;
- blk_t blk_itr = fs->super->s_first_data_block;
+ blk64_t blk;
+ blk64_t blk_itr = fs->super->s_first_data_block;
ext2_ino_t ino_itr = 1;

EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
--
1.6.0.6

2009-05-04 06:20:34

by Valerie Aurora

Subject: Re: [PATCH 2/6] [64-bit] write_bitmaps(): blk_t -> blk64_t

On Fri, May 01, 2009 at 04:46:31AM -0400, Nick Dokos wrote:
> write_bitmaps() was truncating blocks numbers to 32 bits and therefore
> writing at the wrong place on the disk.
>
> Signed-off-by: Nick Dokos <[email protected]>
> ---
> lib/ext2fs/rw_bitmaps.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c
> index 5b504bf..da472a8 100644
> --- a/lib/ext2fs/rw_bitmaps.c
> +++ b/lib/ext2fs/rw_bitmaps.c
> @@ -36,8 +36,8 @@ static errcode_t write_bitmaps(ext2_filsys fs, int do_inode, int do_block)
> errcode_t retval;
> char *block_buf, *inode_buf;
> int csum_flag = 0;
> - blk_t blk;
> - blk_t blk_itr = fs->super->s_first_data_block;
> + blk64_t blk;
> + blk64_t blk_itr = fs->super->s_first_data_block;
> ext2_ino_t ino_itr = 1;
>
> EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
> --
> 1.6.0.6
>

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

-VAL