5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx> commit 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 upstream. Avoid to ignore error in "err". Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20230826174712.4059355-4-shikemeng@xxxxxxxxxxxxxxx Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> Cc: stable@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/ext4/resize.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1938,9 +1938,7 @@ static int ext4_convert_meta_bg(struct s 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");
