diff options
author | Kemeng Shi <shikemeng@huaweicloud.com> | 2023-08-26 20:47:02 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 19:50:21 +0300 |
commit | 1fbfdcc3d65e4778d6a1dbc45eec17650447dd59 (patch) | |
tree | 3fdaa3f498e1dc21a67060469030df26efdaf84e /fs | |
parent | dfdfd3f2183073038d82f6fa16747b9d4c41e784 (diff) | |
download | linux-1fbfdcc3d65e4778d6a1dbc45eec17650447dd59.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')
-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 b9ac3b9c84b5..d203cefd71b7 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1940,9 +1940,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"); |