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-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48f1551592c54f7d8e2befc72a99ff4e47f7dca0;p=users%2Fjedix%2Flinux-maple.git

ext4: correct return value of ext4_convert_meta_bg

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

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 7cbc695b70052..9cb9ed9685996 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1984,9 +1984,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");