Commit 5b296cfa authored by Kemeng Shi's avatar Kemeng Shi Committed by Baokun Li
Browse files

ext4: correct return value of ext4_convert_meta_bg 

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=3c1ad03a5ff20645ca67a84af8a078285fe20702



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

commit 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 upstream.

Avoid to ignore error in "err".

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Link: https://lore.kernel.org/r/20230826174712.4059355-4-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
parent e4bd0053

fs/ext4/resize.c

+1 −3
Original line number Diff line number Diff line
@@ -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");