aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorKemeng Shi2023-08-27 01:47:02 +0800
committerTheodore Ts'o2023-10-05 22:32:14 -0400
commit48f1551592c54f7d8e2befc72a99ff4e47f7dca0 (patch)
treefba9827d698632f886d3a99f2c58af805b834091 /fs/ext4
parent9adac8b01f4be28acd5838aade42b8daa4f0b642 (diff)
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
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/resize.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 7cbc695b7005..9cb9ed968599 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");