Merge v5.14-rc3 into usb-next

[linux-2.6-microblaze.git] / fs / btrfs / delayed-ref.c

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index c92d9d4..ca848b1 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -641,7 +641,6 @@ static noinline void update_existing_head_ref(struct btrfs_trans_handle *trans,
        struct btrfs_delayed_ref_root *delayed_refs =
                &trans->transaction->delayed_refs;
        struct btrfs_fs_info *fs_info = trans->fs_info;
-       u64 flags = btrfs_ref_head_to_space_flags(existing);
        int old_ref_mod;
 
        BUG_ON(existing->is_data != update->is_data);
@@ -711,26 +710,6 @@ static noinline void update_existing_head_ref(struct btrfs_trans_handle *trans,
                }
        }
 
-       /*
-        * This handles the following conditions:
-        *
-        * 1. We had a ref mod of 0 or more and went negative, indicating that
-        *    we may be freeing space, so add our space to the
-        *    total_bytes_pinned counter.
-        * 2. We were negative and went to 0 or positive, so no longer can say
-        *    that the space would be pinned, decrement our counter from the
-        *    total_bytes_pinned counter.
-        * 3. We are now at 0 and have ->must_insert_reserved set, which means
-        *    this was a new allocation and then we dropped it, and thus must
-        *    add our space to the total_bytes_pinned counter.
-        */
-       if (existing->total_ref_mod < 0 && old_ref_mod >= 0)
-               btrfs_mod_total_bytes_pinned(fs_info, flags, existing->num_bytes);
-       else if (existing->total_ref_mod >= 0 && old_ref_mod < 0)
-               btrfs_mod_total_bytes_pinned(fs_info, flags, -existing->num_bytes);
-       else if (existing->total_ref_mod == 0 && existing->must_insert_reserved)
-               btrfs_mod_total_bytes_pinned(fs_info, flags, existing->num_bytes);
-
        spin_unlock(&existing->lock);
 }
 
@@ -835,17 +814,12 @@ add_delayed_ref_head(struct btrfs_trans_handle *trans,
                kmem_cache_free(btrfs_delayed_ref_head_cachep, head_ref);
                head_ref = existing;
        } else {
-               u64 flags = btrfs_ref_head_to_space_flags(head_ref);
-
                if (head_ref->is_data && head_ref->ref_mod < 0) {
                        delayed_refs->pending_csums += head_ref->num_bytes;
                        trans->delayed_ref_updates +=
                                btrfs_csum_bytes_to_leaves(trans->fs_info,
                                                           head_ref->num_bytes);
                }
-               if (head_ref->ref_mod < 0)
-                       btrfs_mod_total_bytes_pinned(trans->fs_info, flags,
-                                                    head_ref->num_bytes);
                delayed_refs->num_heads++;
                delayed_refs->num_heads_ready++;
                atomic_inc(&delayed_refs->num_entries);
@@ -1000,7 +974,7 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
                kmem_cache_free(btrfs_delayed_tree_ref_cachep, ref);
 
        if (qrecord_inserted)
-               btrfs_qgroup_trace_extent_post(fs_info, record);
+               btrfs_qgroup_trace_extent_post(trans, record);
 
        return 0;
 }
@@ -1095,7 +1069,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
 
 
        if (qrecord_inserted)
-               return btrfs_qgroup_trace_extent_post(fs_info, record);
+               return btrfs_qgroup_trace_extent_post(trans, record);
        return 0;
 }