Skip to content

Commit 764793b

Browse files
riteshharjanigregkh
authored andcommitted
ext4: fix error handling in ext4_restore_inline_data()
commit 897026a upstream. While running "./check -I 200 generic/475" it sometimes gives below kernel BUG(). Ideally we should not call ext4_write_inline_data() if ext4_create_inline_data() has failed. <log snip> [73131.453234] kernel BUG at fs/ext4/inline.c:223! <code snip> 212 static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc, 213 void *buffer, loff_t pos, unsigned int len) 214 { <...> 223 BUG_ON(!EXT4_I(inode)->i_inline_off); 224 BUG_ON(pos + len > EXT4_I(inode)->i_inline_size); This patch handles the error and prints out a emergency msg saying potential data loss for the given inode (since we couldn't restore the original inline_data due to some previous error). [ 9571.070313] EXT4-fs (dm-0): error restoring inline_data for inode -- potential data loss! (inode 1703982, error -30) Reported-by: Eric Whitney <enwlinux@gmail.com> Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/9f4cd7dfd54fa58ff27270881823d94ddf78dd07.1642416995.git.riteshh@linux.ibm.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6c5bd55 commit 764793b

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

fs/ext4/inline.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,15 @@ static void ext4_restore_inline_data(handle_t *handle, struct inode *inode,
11201120
struct ext4_iloc *iloc,
11211121
void *buf, int inline_size)
11221122
{
1123-
ext4_create_inline_data(handle, inode, inline_size);
1123+
int ret;
1124+
1125+
ret = ext4_create_inline_data(handle, inode, inline_size);
1126+
if (ret) {
1127+
ext4_msg(inode->i_sb, KERN_EMERG,
1128+
"error restoring inline_data for inode -- potential data loss! (inode %lu, error %d)",
1129+
inode->i_ino, ret);
1130+
return;
1131+
}
11241132
ext4_write_inline_data(inode, iloc, buf, 0, inline_size);
11251133
ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
11261134
}

0 commit comments

Comments
 (0)