From: Kemeng Shi shikemeng@huaweicloud.com

stable inclusion from stable-v5.10.202 commit 3c1ad03a5ff20645ca67a84af8a078285fe20702 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I853YM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...

--------------------------------

commit 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 upstream.

Avoid to ignore error in "err".

Signed-off-by: Kemeng Shi shikemeng@huaweicloud.com Link: https://lore.kernel.org/r/20230826174712.4059355-4-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o tytso@mit.edu Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Baokun Li libaokun1@huawei.com --- fs/ext4/resize.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index c07bcceb2619..40eb3019e966 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1928,9 +1928,7 @@ static int ext4_convert_meta_bg(struct super_block *sb, struct inode *inode)

errout: ret = ext4_journal_stop(handle); - if (!err) - err = ret; - return ret; + return err ? err : ret;

invalid_resize_inode: ext4_error(sb, "corrupted/inconsistent resize inode");