Skip to contentSkip to conversation

blk_t -> blk64_t in read_bitmaps().

PATCH In review Nick Dokos 3 participants 3 messages Apr 18, 2009 – Apr 21, 2009

lore
Share & tools
lore

Nick Dokos

author
#0 lore raw

PATCH 1/2 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.)

---
 lib/ext2fs/rw_bitmaps.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
lib/ext2fs/rw_bitmaps.c +3 -3
index cee6142..5b504bf 100644
@@ -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;
 
Signature · 1 line
1.6.0.6
Reviewed-by on v1 1/2
#1 lore raw
Quoted 6 lines · 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.)

Looks right to me as well.

Quoted 21 lines
---
 lib/ext2fs/rw_bitmaps.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
lib/ext2fs/rw_bitmaps.c +3 -3
index cee6142..5b504bf 100644
@@ -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;
 
#2 lore raw
In reply to Nick Dokos
Quoted 6 lines · 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.)

Pulled and pushed.

-VAL

Quoted 24 lines
---
 lib/ext2fs/rw_bitmaps.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
lib/ext2fs/rw_bitmaps.c +3 -3
index cee6142..5b504bf 100644
@@ -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;
 
Signature · 1 line
1.6.0.6