Skip to content

Commit fb33eb2

Browse files
fdmananakdave
authored andcommitted
btrfs: fix leak of qgroup extent records after transaction abort
Qgroup extent records are created when delayed ref heads are created and then released after accounting extents at btrfs_qgroup_account_extents(), called during the transaction commit path. If a transaction is aborted we free the qgroup records by calling btrfs_qgroup_destroy_extent_records() at btrfs_destroy_delayed_refs(), unless we don't have delayed references. We are incorrectly assuming that no delayed references means we don't have qgroup extents records. We can currently have no delayed references because we ran them all during a transaction commit and the transaction was aborted after that due to some error in the commit path. So fix this by ensuring we btrfs_qgroup_destroy_extent_records() at btrfs_destroy_delayed_refs() even if we don't have any delayed references. Reported-by: [email protected] Link: https://lore.kernel.org/linux-btrfs/[email protected]/ Fixes: 81f7eb0 ("btrfs: destroy qgroup extent records on transaction abort") CC: [email protected] # 6.1+ Reviewed-by: Josef Bacik <[email protected]> Reviewed-by: Qu Wenruo <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 9d274c1 commit fb33eb2

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

fs/btrfs/disk-io.c

+1-9
Original file line numberDiff line numberDiff line change
@@ -4538,18 +4538,10 @@ static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
45384538
struct btrfs_fs_info *fs_info)
45394539
{
45404540
struct rb_node *node;
4541-
struct btrfs_delayed_ref_root *delayed_refs;
4541+
struct btrfs_delayed_ref_root *delayed_refs = &trans->delayed_refs;
45424542
struct btrfs_delayed_ref_node *ref;
45434543

4544-
delayed_refs = &trans->delayed_refs;
4545-
45464544
spin_lock(&delayed_refs->lock);
4547-
if (atomic_read(&delayed_refs->num_entries) == 0) {
4548-
spin_unlock(&delayed_refs->lock);
4549-
btrfs_debug(fs_info, "delayed_refs has NO entry");
4550-
return;
4551-
}
4552-
45534545
while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {
45544546
struct btrfs_delayed_ref_head *head;
45554547
struct rb_node *n;

0 commit comments

Comments
 (0)