From: Kemeng Shi <shikemeng@huaweicloud.com>
Date: Sat, 26 Aug 2023 17:47:02 +0000 (+0800)
Subject: ext4: correct return value of ext4_convert_meta_bg
X-Git-Tag: v6.5.13~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8547701c3b0aa84d7267bfee69d8d03389b22f6a;p=thirdparty%2Fkernel%2Fstable.git

ext4: correct return value of ext4_convert_meta_bg

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>
---

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 87cd5b07a9708..8cf9a07c2c537 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1982,9 +1982,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");