aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Whitney <enwlinux@gmail.com>2013-09-09 10:53:03 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-09-09 10:53:06 -0400
commit085757fcc22a86168ee6793dfad9a95d88fb09db (patch)
treebe008f6c59fbedcbd7ba61674c364813fbe22d0b
parent8ab395524b95875818505a497428cab73e80c0d5 (diff)
downloade2fsprogs-085757fcc22a86168ee6793dfad9a95d88fb09db.tar.gz
e2fsprogs-085757fcc22a86168ee6793dfad9a95d88fb09db.tar.xz
e2fsprogs-085757fcc22a86168ee6793dfad9a95d88fb09db.zip
e2fsck: don't report uninit extents past EOF invalid
Commit d3f32c2db8 introduced a regression that caused e2fsck failures in xfstests generic 013, 070, 083, 091, and 263. Uninitialized extents created by fallocate() at the end of file with the FALLOC_FL_KEEP_SIZE flag were identified as invalid. However, because the file size is not increased when FALLOC_FL_KEEP_SIZE is used, uninitialized extents can correctly contain blocks located past the end of file. Fix this by filtering out possible invalid extents if they are uninitialized and extend past the block containing the end of file. Signed-off-by: Eric Whitney <enwlinux@gmail.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--e2fsck/pass1.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 8f2f961c..8279ce52 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1761,6 +1761,7 @@ void e2fsck_clear_inode(e2fsck_t ctx, ext2_ino_t ino,
static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
struct process_block_struct *pb,
blk64_t start_block, blk64_t end_block,
+ blk64_t eof_block,
ext2_extent_handle_t ehandle)
{
struct ext2fs_extent extent;
@@ -1789,7 +1790,9 @@ static void scan_extent_node(e2fsck_t ctx, struct problem_context *pctx,
problem = PR_1_EXTENT_BAD_START_BLK;
else if (extent.e_lblk < start_block)
problem = PR_1_OUT_OF_ORDER_EXTENTS;
- else if (end_block && last_lblk > end_block)
+ else if ((end_block && last_lblk > end_block) &&
+ (!(extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT &&
+ last_lblk > eof_block)))
problem = PR_1_EXTENT_END_OUT_OF_BOUNDS;
else if (is_leaf && extent.e_len == 0)
problem = PR_1_EXTENT_LENGTH_ZERO;
@@ -1855,7 +1858,7 @@ report_problem:
ext2fs_extent_fix_parents(ehandle);
}
scan_extent_node(ctx, pctx, pb, extent.e_lblk,
- last_lblk, ehandle);
+ last_lblk, eof_block, ehandle);
if (pctx->errcode)
return;
pctx->errcode = ext2fs_extent_get(ehandle,
@@ -1958,6 +1961,7 @@ static void check_blocks_extents(e2fsck_t ctx, struct problem_context *pctx,
ext2_filsys fs = ctx->fs;
ext2_ino_t ino = pctx->ino;
errcode_t retval;
+ blk64_t eof_lblk;
pctx->errcode = ext2fs_extent_open2(fs, ino, inode, &ehandle);
if (pctx->errcode) {
@@ -1975,7 +1979,9 @@ static void check_blocks_extents(e2fsck_t ctx, struct problem_context *pctx,
ctx->extent_depth_count[info.max_depth]++;
}
- scan_extent_node(ctx, pctx, pb, 0, 0, ehandle);
+ eof_lblk = ((EXT2_I_SIZE(inode) + fs->blocksize - 1) >>
+ EXT2_BLOCK_SIZE_BITS(fs->super)) - 1;
+ scan_extent_node(ctx, pctx, pb, 0, 0, eof_lblk, ehandle);
if (pctx->errcode &&
fix_problem(ctx, PR_1_EXTENT_ITERATE_FAILURE, pctx)) {
pb->num_blocks = 0;