From: Jan Kara jack@suse.cz
mainline inclusion from mainline-5.5-rc1 commit 6cb367c2d1f8875043aa2d238eca9a2602dc1f72 category: bugfix bugzilla: 25031 CVE: NA ---------------------------
Use ext4 helper ext4_journal_extend() instead of opencoding it in ext4_try_to_expand_extra_isize().
Reviewed-by: Theodore Ts'o tytso@mit.edu Signed-off-by: Jan Kara jack@suse.cz Link: https://lore.kernel.org/r/20191105164437.32602-8-jack@suse.cz Signed-off-by: Theodore Ts'o tytso@mit.edu
Signed-off-by: zhangyi (F) yi.zhang@huawei.com Reviewed-by: Yang Erkun yangerkun@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- fs/ext4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 58e92e0..a430120 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -6027,8 +6027,7 @@ static int ext4_try_to_expand_extra_isize(struct inode *inode, * If this is felt to be critical, then e2fsck should be run to * force a large enough s_min_extra_isize. */ - if (ext4_handle_valid(handle) && - jbd2_journal_extend(handle, + if (ext4_journal_extend(handle, EXT4_DATA_TRANS_BLOCKS(inode->i_sb)) != 0) return -ENOSPC;