]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: clear dirty status from extent buffer on error at insert_new_root()
authorFilipe Manana <fdmanana@suse.com>
Mon, 30 Jun 2025 09:50:46 +0000 (10:50 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:30:53 +0000 (18:30 +0200)
commit c0d013495a80cbb53e2288af7ae0ec4170aafd7c upstream.

If we failed to insert the tree mod log operation, we are not removing the
dirty status from the allocated and dirtied extent buffer before we free
it. Removing the dirty status is needed for several reasons such as to
adjust the fs_info->dirty_metadata_bytes counter and remove the dirty
status from the respective folios. So add the missing call to
btrfs_clear_buffer_dirty().

Fixes: f61aa7ba08ab ("btrfs: do not BUG_ON() on tree mod log failure at insert_new_root()")
CC: stable@vger.kernel.org # 6.6+
Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/ctree.c

index 29c16459740112b895996ec50b67d8c6a65d9846..3ba15d9c3e8861a0c912bd2a255dc5aaa08d25e0 100644 (file)
@@ -2901,6 +2901,7 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
        if (ret < 0) {
                int ret2;
 
+               btrfs_clear_buffer_dirty(trans, c);
                ret2 = btrfs_free_tree_block(trans, btrfs_root_id(root), c, 0, 1);
                if (ret2 < 0)
                        btrfs_abort_transaction(trans, ret2);