Skip to content

Commit 4d231b9

Browse files
Thadeu Lima de Souza Cascardotytso
authored andcommitted
ext4: return error on ext4_find_inline_entry
In case of errors when reading an inode from disk or traversing inline directory entries, return an error-encoded ERR_PTR instead of returning NULL. ext4_find_inline_entry only caller, __ext4_find_entry already returns such encoded errors. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@igalia.com> Link: https://patch.msgid.link/20240821152324.3621860-3-cascardo@igalia.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent cd69f8f commit 4d231b9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

fs/ext4/inline.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,8 +1669,9 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
16691669
void *inline_start;
16701670
int inline_size;
16711671

1672-
if (ext4_get_inode_loc(dir, &iloc))
1673-
return NULL;
1672+
ret = ext4_get_inode_loc(dir, &iloc);
1673+
if (ret)
1674+
return ERR_PTR(ret);
16741675

16751676
down_read(&EXT4_I(dir)->xattr_sem);
16761677
if (!ext4_has_inline_data(dir)) {
@@ -1701,7 +1702,10 @@ struct buffer_head *ext4_find_inline_entry(struct inode *dir,
17011702

17021703
out:
17031704
brelse(iloc.bh);
1704-
iloc.bh = NULL;
1705+
if (ret < 0)
1706+
iloc.bh = ERR_PTR(ret);
1707+
else
1708+
iloc.bh = NULL;
17051709
out_find:
17061710
up_read(&EXT4_I(dir)->xattr_sem);
17071711
return iloc.bh;

0 commit comments

Comments
 (0)