summaryrefslogtreecommitdiff
path: root/fs/ext4/resize.c
diff options
context:
space:
mode:
authorKemeng Shi <shikemeng@huaweicloud.com>2023-08-26 20:47:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-28 19:45:45 +0300
commit9f12769f3b637070fca315a3784590a8f7cca4e9 (patch)
tree6057a7263520c1542a24c6c06127135ecd54b000 /fs/ext4/resize.c
parent90d1ea683ae51fdf2e92e26e638e7b13d1fa1219 (diff)
downloadlinux-9f12769f3b637070fca315a3784590a8f7cca4e9.tar.xz
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>
Diffstat (limited to 'fs/ext4/resize.c')
-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 3d8e8ad950cd..54e636b70ca7 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1912,9 +1912,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");