btrfs: delayed-ref: Use btrfs_ref to refactor btrfs_add_delayed_data_ref()

Just like btrfs_add_delayed_tree_ref(), use btrfs_ref to refactor
btrfs_add_delayed_data_ref().

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

3 files changed, 27 insertions, 22 deletions

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index a9c2f469caa9..5c1f2462f757 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -832,10 +832,9 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
  * add a delayed data ref. it's similar to btrfs_add_delayed_tree_ref.
  */
 int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
-                               u64 bytenr, u64 num_bytes,
-                               u64 parent, u64 ref_root,
-                               u64 owner, u64 offset, u64 reserved, int action,
-                               int *old_ref_mod, int *new_ref_mod)
+                               struct btrfs_ref *generic_ref,
+                               u64 reserved, int *old_ref_mod,
+                               int *new_ref_mod)
 {
         struct btrfs_fs_info *fs_info = trans->fs_info;
         struct btrfs_delayed_data_ref *ref;
@@ -843,9 +842,17 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
         struct btrfs_delayed_ref_root *delayed_refs;
         struct btrfs_qgroup_extent_record *record = NULL;
         int qrecord_inserted;
+        int action = generic_ref->action;
         int ret;
+        u64 bytenr = generic_ref->bytenr;
+        u64 num_bytes = generic_ref->len;
+        u64 parent = generic_ref->parent;
+        u64 ref_root = generic_ref->data_ref.ref_root;
+        u64 owner = generic_ref->data_ref.ino;
+        u64 offset = generic_ref->data_ref.offset;
         u8 ref_type;
 
+        ASSERT(generic_ref->type == BTRFS_REF_DATA && action);
         ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS);
         if (!ref)
                 return -ENOMEM;
@@ -869,7 +876,9 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
         }
 
         if (test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags) &&
-            is_fstree(ref_root)) {
+            is_fstree(ref_root) &&
+            is_fstree(generic_ref->real_root) &&
+            !generic_ref->skip_qgroup) {
                 record = kzalloc(sizeof(*record), GFP_NOFS);
                 if (!record) {
                         kmem_cache_free(btrfs_delayed_data_ref_cachep, ref);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index 515d1a3d8080..7cbb52adc553 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -337,10 +337,9 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans,
                                struct btrfs_delayed_extent_op *extent_op,
                                int *old_ref_mod, int *new_ref_mod);
 int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans,
-                               u64 bytenr, u64 num_bytes,
-                               u64 parent, u64 ref_root,
-                               u64 owner, u64 offset, u64 reserved, int action,
-                               int *old_ref_mod, int *new_ref_mod);
+                               struct btrfs_ref *generic_ref,
+                               u64 reserved, int *old_ref_mod,
+                               int *new_ref_mod);
 int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,
                                 struct btrfs_trans_handle *trans,
                                 u64 bytenr, u64 num_bytes,
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 88deec012386..cbddd5ab7d65 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2065,10 +2065,8 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
                 ret = btrfs_add_delayed_tree_ref(trans, &generic_ref,
                                 NULL, &old_ref_mod, &new_ref_mod);
         } else {
-                ret = btrfs_add_delayed_data_ref(trans, bytenr,
-                                                 num_bytes, parent,
-                                                 root_objectid, owner, offset,
-                                                 0, BTRFS_ADD_DELAYED_REF,
+                btrfs_init_data_ref(&generic_ref, root_objectid, owner, offset);
+                ret = btrfs_add_delayed_data_ref(trans, &generic_ref, 0,
                                                  &old_ref_mod, &new_ref_mod);
         }
 
@@ -7276,10 +7274,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans,
                 ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, NULL,
                                                  &old_ref_mod, &new_ref_mod);
         } else {
-                ret = btrfs_add_delayed_data_ref(trans, bytenr,
-                                                 num_bytes, parent,
-                                                 root_objectid, owner, offset,
-                                                 0, BTRFS_DROP_DELAYED_REF,
+                btrfs_init_data_ref(&generic_ref, root_objectid, owner, offset);
+                ret = btrfs_add_delayed_data_ref(trans, &generic_ref, 0,
                                                  &old_ref_mod, &new_ref_mod);
         }
 
@@ -8385,6 +8381,7 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
                                      u64 offset, u64 ram_bytes,
                                      struct btrfs_key *ins)
 {
+        struct btrfs_ref generic_ref = { 0 };
         int ret;
 
         BUG_ON(root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID);
@@ -8393,11 +8390,11 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
                            root->root_key.objectid, owner, offset,
                            BTRFS_ADD_DELAYED_EXTENT);
 
-        ret = btrfs_add_delayed_data_ref(trans, ins->objectid,
-                                         ins->offset, 0,
-                                         root->root_key.objectid, owner,
-                                         offset, ram_bytes,
-                                         BTRFS_ADD_DELAYED_EXTENT, NULL, NULL);
+        btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT,
+                               ins->objectid, ins->offset, 0);
+        btrfs_init_data_ref(&generic_ref, root->root_key.objectid, owner, offset);
+        ret = btrfs_add_delayed_data_ref(trans, &generic_ref,
+                                         ram_bytes, NULL, NULL);
         return ret;
 }