Skip to contentSkip to conversation

e2fsck: make block counting variable in pass1 64 bits

PATCH Applied Eric Sandeen 2 participants 2 messages Mar 30, 2010 – May 13, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e2fsck: make block counting variable in pass1 64 bits

Justin reported that creating a 4T file with posix_fallocate led to fsck errors:

e2fsck 1.41.10 (10-Feb-2009)
Pass 1: Checking inodes, blocks, and sizes
Inode 12, i_blocks is 8589935432, should be 840. Fix? yes

This looks like a 32-bit overflow.

commmit 8a8f36540bbf5d4397cf476e216e9a720b5c1d8e added handling of the high i_blocks number, but we accumulate blocks in the num_blocks field, and that's still just 32 bits.

Note: we don't need to expand max_blocks for now, that's only used in the non-extents case, and those files have smaller max sizes.

I haven't been able to replicate the problem, oddly, but Justin reports that this patch fixed his situation.

---

(resend, a thunderbird upgrade changed things so vger was eating my patches)

e2fsck/pass1.c +1 -1
index 09ff1d0..8c8fe8c 100644
@@ -80,7 +80,7 @@ struct process_block_struct {
 	ext2_ino_t	ino;
 	unsigned	is_dir:1, is_reg:1, clear:1, suppress:1,
 				fragmented:1, compressed:1, bbcheck:1;
-	blk_t		num_blocks;
+	blk64_t		num_blocks;
 	blk_t		max_blocks;
 	e2_blkcnt_t	last_block;
 	int		num_illegal_blocks;
#1 lore raw

Applied to the maint branch

- Ted

Quoted 44 lines · Eric Sandeen

Justin reported that creating a 4T file with posix_fallocate led to fsck errors:

e2fsck 1.41.10 (10-Feb-2009)
Pass 1: Checking inodes, blocks, and sizes
Inode 12, i_blocks is 8589935432, should be 840. Fix? yes

This looks like a 32-bit overflow.

commmit 8a8f36540bbf5d4397cf476e216e9a720b5c1d8e added handling of the high i_blocks number, but we accumulate blocks in the num_blocks field, and that's still just 32 bits.

Note: we don't need to expand max_blocks for now, that's only used in the non-extents case, and those files have smaller max sizes.

I haven't been able to replicate the problem, oddly, but Justin reports that this patch fixed his situation.

---

(resend, a thunderbird upgrade changed things so vger was eating my patches)

e2fsck/pass1.c +1 -2
index 09ff1d0..8c8fe8c 100644
@@ -80,7 +80,7 @@ struct process_block_struct {
 	ext2_ino_t	ino;
 	unsigned	is_dir:1, is_reg:1, clear:1, suppress:1,
 				fragmented:1, compressed:1, bbcheck:1;
-	blk_t		num_blocks;
+	blk64_t		num_blocks;
 	blk_t		max_blocks;
 	e2_blkcnt_t	last_block;
 	int		num_illegal_blocks;
 
--

To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html