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 17:15:17 +0000 |
| commit | 8547701c3b0aa84d7267bfee69d8d03389b22f6a (patch) | |
| tree | 61dfd20b25e758ead4f54ac3372cf5a58e4386b8 | |
| parent | ec51fb39b173a07633a0ffbe681e8bf18a81ebeb (diff) | |
| download | linux-stable-8547701c3b0aa84d7267bfee69d8d03389b22f6a.tar.gz linux-stable-8547701c3b0aa84d7267bfee69d8d03389b22f6a.tar.bz2 linux-stable-8547701c3b0aa84d7267bfee69d8d03389b22f6a.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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 87cd5b07a970..8cf9a07c2c53 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1982,9 +1982,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"); |