summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKemeng Shi <shikemeng@huaweicloud.com>2023-08-27 01:47:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-28 16:55:01 +0000
commit3c1ad03a5ff20645ca67a84af8a078285fe20702 (patch)
tree0a182037f5965bf4e60e9edc9adb12abb7557aff
parentd739a7e38944208d0b937604389c0e9b82a944db (diff)
downloadlinux-3c1ad03a5ff20645ca67a84af8a078285fe20702.tar.gz
linux-3c1ad03a5ff20645ca67a84af8a078285fe20702.tar.bz2
linux-3c1ad03a5ff20645ca67a84af8a078285fe20702.zip
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>
-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 a71bec2afff7..2ff807666256 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1918,9 +1918,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");