btrfs: extent-tree: Use btrfs_ref to refactor btrfs_free_extent()

Similar to btrfs_inc_extent_ref(), use btrfs_ref to replace the long
parameter list and the confusing @owner parameter.

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

1 files changed, 12 insertions, 10 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index a4fc89a84baf..7e85dca0e6f2 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -997,11 +997,14 @@ delete_extent_item:
                                 extent_end = ALIGN(extent_end,
                                                    fs_info->sectorsize);
                         } else if (update_refs && disk_bytenr > 0) {
-                                ret = btrfs_free_extent(trans, root,
-                                                disk_bytenr, num_bytes, 0,
+                                btrfs_init_generic_ref(&ref,
+                                                BTRFS_DROP_DELAYED_REF,
+                                                disk_bytenr, num_bytes, 0);
+                                btrfs_init_data_ref(&ref,
                                                 root->root_key.objectid,
-                                                key.objectid, key.offset -
-                                                extent_offset);
+                                                key.objectid,
+                                                key.offset - extent_offset);
+                                ret = btrfs_free_extent(trans, &ref);
                                 BUG_ON(ret); /* -ENOMEM */
                                 inode_sub_bytes(inode,
                                                 extent_end - key.offset);
@@ -1318,6 +1321,9 @@ again:
 
         other_start = end;
         other_end = 0;
+        btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, bytenr,
+                               num_bytes, 0);
+        btrfs_init_data_ref(&ref, root->root_key.objectid, ino, orig_offset);
         if (extent_mergeable(leaf, path->slots[0] + 1,
                              ino, bytenr, orig_offset,
                              &other_start, &other_end)) {
@@ -1328,9 +1334,7 @@ again:
                 extent_end = other_end;
                 del_slot = path->slots[0] + 1;
                 del_nr++;
-                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
-                                        0, root->root_key.objectid,
-                                        ino, orig_offset);
+                ret = btrfs_free_extent(trans, &ref);
                 if (ret) {
                         btrfs_abort_transaction(trans, ret);
                         goto out;
@@ -1348,9 +1352,7 @@ again:
                 key.offset = other_start;
                 del_slot = path->slots[0];
                 del_nr++;
-                ret = btrfs_free_extent(trans, root, bytenr, num_bytes,
-                                        0, root->root_key.objectid,
-                                        ino, orig_offset);
+                ret = btrfs_free_extent(trans, &ref);
                 if (ret) {
                         btrfs_abort_transaction(trans, ret);
                         goto out;