This is a note to let you know that I've just added the patch titled
btrfs: check error value from btrfs_update_inode in tree log
to the 5.12-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:
btrfs-check-error-value-from-btrfs_update_inode-in-tree-log.patch
and it can be found in the queue-5.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f96d44743a44e3332f75d23d2075bb8270900e1d Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@xxxxxxxxxxxxxx>
Date: Wed, 19 May 2021 11:26:25 -0400
Subject: btrfs: check error value from btrfs_update_inode in tree log
From: Josef Bacik <josef@xxxxxxxxxxxxxx>
commit f96d44743a44e3332f75d23d2075bb8270900e1d upstream.
Error injection testing uncovered a case where we ended up with invalid
link counts on an inode. This happened because we failed to notice an
error when updating the inode while replaying the tree log, and
committed the transaction with an invalid file system.
Fix this by checking the return value of btrfs_update_inode. This
resolved the link count errors I was seeing, and we already properly
handle passing up the error values in these paths.
CC: stable@xxxxxxxxxxxxxxx # 4.4+
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@xxxxxxx>
Reviewed-by: Qu Wenruo <wqu@xxxxxxxx>
Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
Reviewed-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/btrfs/tree-log.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1574,7 +1574,9 @@ static noinline int add_inode_ref(struct
if (ret)
goto out;
- btrfs_update_inode(trans, root, BTRFS_I(inode));
+ ret = btrfs_update_inode(trans, root, BTRFS_I(inode));
+ if (ret)
+ goto out;
}
ref_ptr = (unsigned long)(ref_ptr + ref_struct_size) + namelen;
@@ -1749,7 +1751,9 @@ static noinline int fixup_inode_link_cou
if (nlink != inode->i_nlink) {
set_nlink(inode, nlink);
- btrfs_update_inode(trans, root, BTRFS_I(inode));
+ ret = btrfs_update_inode(trans, root, BTRFS_I(inode));
+ if (ret)
+ goto out;
}
BTRFS_I(inode)->index_cnt = (u64)-1;
Patches currently in stable-queue which might be from josef@xxxxxxxxxxxxxx are
queue-5.12/btrfs-fixup-error-handling-in-fixup_inode_link_counts.patch
queue-5.12/btrfs-mark-ordered-extent-and-inode-with-error-if-we-fail-to-finish.patch
queue-5.12/btrfs-abort-in-rename_exchange-if-we-fail-to-insert-the-second-ref.patch
queue-5.12/btrfs-check-error-value-from-btrfs_update_inode-in-tree-log.patch
queue-5.12/btrfs-fix-error-handling-in-btrfs_del_csums.patch
queue-5.12/btrfs-return-errors-from-btrfs_del_csums-in-cleanup_ref_head.patch
