Skip to contentSkip to conversation

e2fsck: mark sparse journal as invalid

PATCH Applied Eric Sandeen 2 participants 2 messages Apr 12, 2010 – May 13, 2010

lore
Share & tools
lore
#0 lore raw

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

---

e2fsck/journal.c +1 -1
index 57783eb..4e6a7c3 100644
@@ -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 >= ext2fs_blocks_count(fs->super))
 		return BLOCK_ABORT;