summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2010-03-30 11:42:51 -0500
committerTheodore Ts'o <tytso@mit.edu>2010-05-13 13:33:53 -0400
commit65d71894c9f254ea1a5eb836e454dd263b13a867 (patch)
treeb579c66fe726c8202f42e55c9e917c7ee729a395
parent5750e5f9246ead0bc2af7da0cb5bcdfc916cace6 (diff)
downloade2fsprogs-65d71894c9f254ea1a5eb836e454dd263b13a867.tar.gz
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. Reported-by: Justin Maggard <jmaggard10@gmail.com> Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-rw-r--r--e2fsck/pass1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 3b65e8a3..0d4c3154 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -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;
e2_blkcnt_t last_db_block;