From: Eric Sandeen Date: Mon, 12 Apr 2010 22:36:33 +0000 (-0500) Subject: e2fsck: mark sparse journal as invalid X-Git-Tag: v1.41.12~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5750e5f9246ead0bc2af7da0cb5bcdfc916cace6;p=thirdparty%2Fe2fsprogs.git e2fsck: mark sparse journal as invalid For a filesystem that fails with: journal_bmap: journal block not found at offset 7334 on loop0 JBD: bad block at offset 7334 e2fsck won't actually fix this; it will mark the fs as clean, so it will mount, but it does not fix that block, and when the journal reaches this point again it will fail again. The following simple change to process_journal_block() might be a little drastic; it will clear & recreate the journal inode if it's sparse - i.e. if it gets block 0. I suppose we could be more complicated and try to replay the journal up to the error, but I'm not sure it's worth it since we're fscking it anyway. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 155857d98..64a0fd627 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -214,7 +214,7 @@ static int process_journal_block(ext2_filsys fs, p = (struct process_block_struct *) priv_data; - if (blk < fs->super->s_first_data_block || + if (!blk || blk < fs->super->s_first_data_block || blk >= fs->super->s_blocks_count) return BLOCK_ABORT;