Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

ext4: fix block validity checks for journal inodes using indirect blocks

Commit 345c0dbf3a30 ("ext4: protect journal inode's blocks using
block_validity") failed to add an exception for the journal inode in
ext4_check_blockref(), which is the function used by ext4_get_branch()
for indirect blocks. This caused attempts to read from the ext3-style
journals to fail with:

[ 848.968550] EXT4-fs error (device sdb7): ext4_get_branch:171: inode #8: block 30343695: comm jbd2/sdb7-8: invalid block

Fix this by adding the missing exception check.

Fixes: 345c0dbf3a30 ("ext4: protect journal inode's blocks using block_validity")
Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

+5
+5
fs/ext4/block_validity.c
··· 277 277 __le32 *bref = p; 278 278 unsigned int blk; 279 279 280 + if (ext4_has_feature_journal(inode->i_sb) && 281 + (inode->i_ino == 282 + le32_to_cpu(EXT4_SB(inode->i_sb)->s_es->s_journal_inum))) 283 + return 0; 284 + 280 285 while (bref < p+max) { 281 286 blk = le32_to_cpu(*bref++); 282 287 if (blk &&