diff options
| author | Kemeng Shi <shikemeng@huaweicloud.com> | 2023-08-27 01:47:02 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 16:56:35 +0000 |
| commit | 8f9842c4b92535323c7624cbf3038b42b5abc93b (patch) | |
| tree | 7e5b017fe0f827378303d2b6caad151ae663024b /fs | |
| parent | 8798d3b2722dfff9c5f90860a983f6bf87407bf1 (diff) | |
| download | linux-8f9842c4b92535323c7624cbf3038b42b5abc93b.tar.gz linux-8f9842c4b92535323c7624cbf3038b42b5abc93b.tar.bz2 linux-8f9842c4b92535323c7624cbf3038b42b5abc93b.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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/resize.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 25b38e7cc8c6..bbbb557057de 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1938,9 +1938,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"); |