This is a note to let you know that I've just added the patch titled
ext4: correct return value of ext4_convert_meta_bg
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ext4-correct-return-value-of-ext4_convert_meta_bg.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 Mon Sep 17 00:00:00 2001
From: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
Date: Sun, 27 Aug 2023 01:47:02 +0800
Subject: ext4: correct return value of ext4_convert_meta_bg
From: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
commit 48f1551592c54f7d8e2befc72a99ff4e47f7dca0 upstream.
Avoid to ignore error in "err".
Signed-off-by: Kemeng Shi <shikemeng@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230826174712.4059355-4-shikemeng@xxxxxxxxxxxxxxx
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/ext4/resize.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1985,9 +1985,7 @@ static int ext4_convert_meta_bg(struct s
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");
Patches currently in stable-queue which might be from shikemeng@xxxxxxxxxxxxxxx are
queue-6.1/ext4-correct-offset-of-gdb-backup-in-non-meta_bg-group-to-update_backups.patch
queue-6.1/ext4-remove-gdb-backup-copy-for-meta-bg-in-setup_new_flex_group_blocks.patch
queue-6.1/ext4-add-missed-brelse-in-update_backups.patch
queue-6.1/ext4-correct-return-value-of-ext4_convert_meta_bg.patch
