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:46:36 +0000
commit5f209e49bc00e884ca8930315fdadfe6ce4e4cfd (patch)
treefff7fa91eba501d03125627b85b7e6a262c60096
parent8fceeaed2249426507e8389bbac4f733f6813ef1 (diff)
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 c14a479108f7..c319464ebf74 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1942,9 +1942,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");