btrfs: remove blocksize from btrfs_alloc_free_block and rename

Rename to btrfs_alloc_tree_block as it fits to the alloc/find/free +
_tree_block family. The parameter blocksize was set to the metadata
block size, directly or indirectly.

Signed-off-by: David Sterba <dsterba@suse.cz>

1 files changed, 11 insertions, 15 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 2fb4ab659a0f..d498982bd202 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -258,9 +258,8 @@ int btrfs_copy_root(struct btrfs_trans_handle *trans,
         else
                 btrfs_node_key(buf, &disk_key, 0);
 
-        cow = btrfs_alloc_free_block(trans, root, buf->len, 0,
-                                     new_root_objectid, &disk_key, level,
-                                     buf->start, 0);
+        cow = btrfs_alloc_tree_block(trans, root, 0, new_root_objectid,
+                        &disk_key, level, buf->start, 0);
         if (IS_ERR(cow))
                 return PTR_ERR(cow);
 
@@ -1133,9 +1132,9 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
         } else
                 parent_start = 0;
 
-        cow = btrfs_alloc_free_block(trans, root, buf->len, parent_start,
-                                     root->root_key.objectid, &disk_key,
-                                     level, search_start, empty_size);
+        cow = btrfs_alloc_tree_block(trans, root, parent_start,
+                        root->root_key.objectid, &disk_key, level,
+                        search_start, empty_size);
         if (IS_ERR(cow))
                 return PTR_ERR(cow);
 
@@ -3355,9 +3354,8 @@ static noinline int insert_new_root(struct btrfs_trans_handle *trans,
         else
                 btrfs_node_key(lower, &lower_key, 0);
 
-        c = btrfs_alloc_free_block(trans, root, root->nodesize, 0,
-                                   root->root_key.objectid, &lower_key,
-                                   level, root->node->start, 0);
+        c = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
+                                   &lower_key, level, root->node->start, 0);
         if (IS_ERR(c))
                 return PTR_ERR(c);
 
@@ -3495,9 +3493,8 @@ static noinline int split_node(struct btrfs_trans_handle *trans,
         mid = (c_nritems + 1) / 2;
         btrfs_node_key(c, &disk_key, mid);
 
-        split = btrfs_alloc_free_block(trans, root, root->nodesize, 0,
-                                        root->root_key.objectid,
-                                        &disk_key, level, c->start, 0);
+        split = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
+                        &disk_key, level, c->start, 0);
         if (IS_ERR(split))
                 return PTR_ERR(split);
 
@@ -4275,9 +4272,8 @@ again:
         else
                 btrfs_item_key(l, &disk_key, mid);
 
-        right = btrfs_alloc_free_block(trans, root, root->nodesize, 0,
-                                        root->root_key.objectid,
-                                        &disk_key, 0, l->start, 0);
+        right = btrfs_alloc_tree_block(trans, root, 0, root->root_key.objectid,
+                        &disk_key, 0, l->start, 0);
         if (IS_ERR(right))
                 return PTR_ERR(right);