rename funcs and structs to btrfs

1 files changed, 74 insertions, 73 deletions

diff --git a/extent-tree.c b/extent-tree.c
index 1676a659..4a4f2d81 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -6,11 +6,11 @@
 #include "disk-io.h"
 #include "print-tree.h"
 
-static int find_free_extent(struct ctree_root *orig_root, u64 num_blocks,
+static int find_free_extent(struct btrfs_root *orig_root, u64 num_blocks,
 			    u64 search_start, u64 search_end,
 			    struct btrfs_key *ins);
-static int finish_current_insert(struct ctree_root *extent_root);
-static int run_pending(struct ctree_root *extent_root);
+static int finish_current_insert(struct btrfs_root *extent_root);
+static int run_pending(struct btrfs_root *extent_root);
 
 /*
  * pending extents are blocks that we're trying to allocate in the extent
@@ -21,62 +21,63 @@ static int run_pending(struct ctree_root *extent_root);
  */
 #define CTREE_EXTENT_PENDING_DEL 0
 
-static int inc_block_ref(struct ctree_root *root, u64 blocknr)
+static int inc_block_ref(struct btrfs_root *root, u64 blocknr)
 {
-	struct ctree_path path;
+	struct btrfs_path path;
 	int ret;
 	struct btrfs_key key;
-	struct leaf *l;
-	struct extent_item *item;
+	struct btrfs_leaf *l;
+	struct btrfs_extent_item *item;
 	struct btrfs_key ins;
 	u32 refs;
 
 	find_free_extent(root->extent_root, 0, 0, (u64)-1, &ins);
-	init_path(&path);
+	btrfs_init_path(&path);
 	key.objectid = blocknr;
 	key.flags = 0;
 	key.offset = 1;
-	ret = search_slot(root->extent_root, &key, &path, 0, 1);
+	ret = btrfs_search_slot(root->extent_root, &key, &path, 0, 1);
 	if (ret != 0)
 		BUG();
 	BUG_ON(ret != 0);
 	l = &path.nodes[0]->leaf;
-	item = (struct extent_item *)(l->data + btrfs_item_offset(l->items +
-								path.slots[0]));
+	item = (struct btrfs_extent_item *)(l->data +
+					    btrfs_item_offset(l->items +
+							      path.slots[0]));
 	refs = btrfs_extent_refs(item);
 	btrfs_set_extent_refs(item, refs + 1);
 
 	BUG_ON(list_empty(&path.nodes[0]->dirty));
-	release_path(root->extent_root, &path);
+	btrfs_release_path(root->extent_root, &path);
 	finish_current_insert(root->extent_root);
 	run_pending(root->extent_root);
 	return 0;
 }
 
-static int lookup_block_ref(struct ctree_root *root, u64 blocknr, u32 *refs)
+static int lookup_block_ref(struct btrfs_root *root, u64 blocknr, u32 *refs)
 {
-	struct ctree_path path;
+	struct btrfs_path path;
 	int ret;
 	struct btrfs_key key;
-	struct leaf *l;
-	struct extent_item *item;
-	init_path(&path);
+	struct btrfs_leaf *l;
+	struct btrfs_extent_item *item;
+	btrfs_init_path(&path);
 	key.objectid = blocknr;
 	key.flags = 0;
 	key.offset = 1;
-	ret = search_slot(root->extent_root, &key, &path, 0, 0);
+	ret = btrfs_search_slot(root->extent_root, &key, &path, 0, 0);
 	if (ret != 0)
 		BUG();
 	l = &path.nodes[0]->leaf;
-	item = (struct extent_item *)(l->data +
+	item = (struct btrfs_extent_item *)(l->data +
 				      btrfs_item_offset(l->items +
 							path.slots[0]));
 	*refs = btrfs_extent_refs(item);
-	release_path(root->extent_root, &path);
+	btrfs_release_path(root->extent_root, &path);
 	return 0;
 }
 
-int btrfs_inc_ref(struct ctree_root *root, struct tree_buffer *buf)
+int btrfs_inc_ref(struct btrfs_root *root, struct btrfs_buffer *buf)
 {
 	u64 blocknr;
 	int i;
@@ -93,9 +94,9 @@ int btrfs_inc_ref(struct ctree_root *root, struct tree_buffer *buf)
 	return 0;
 }
 
-int btrfs_finish_extent_commit(struct ctree_root *root)
+int btrfs_finish_extent_commit(struct btrfs_root *root)
 {
-	struct ctree_root *extent_root = root->extent_root;
+	struct btrfs_root *extent_root = root->extent_root;
 	unsigned long gang[8];
 	int ret;
 	int i;
@@ -115,10 +116,10 @@ int btrfs_finish_extent_commit(struct ctree_root *root)
 	return 0;
 }
 
-static int finish_current_insert(struct ctree_root *extent_root)
+static int finish_current_insert(struct btrfs_root *extent_root)
 {
 	struct btrfs_key ins;
-	struct extent_item extent_item;
+	struct btrfs_extent_item extent_item;
 	int i;
 	int ret;
 
@@ -130,7 +131,7 @@ static int finish_current_insert(struct ctree_root *extent_root)
 
 	for (i = 0; i < extent_root->current_insert.flags; i++) {
 		ins.objectid = extent_root->current_insert.objectid + i;
-		ret = insert_item(extent_root, &ins, &extent_item,
+		ret = btrfs_insert_item(extent_root, &ins, &extent_item,
 				  sizeof(extent_item));
 		BUG_ON(ret);
 	}
@@ -141,14 +142,14 @@ static int finish_current_insert(struct ctree_root *extent_root)
 /*
  * remove an extent from the root, returns 0 on success
  */
-int __free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
+static int __free_extent(struct btrfs_root *root, u64 blocknr, u64 num_blocks)
 {
-	struct ctree_path path;
+	struct btrfs_path path;
 	struct btrfs_key key;
-	struct ctree_root *extent_root = root->extent_root;
+	struct btrfs_root *extent_root = root->extent_root;
 	int ret;
 	struct btrfs_item *item;
-	struct extent_item *ei;
+	struct btrfs_extent_item *ei;
 	struct btrfs_key ins;
 	u32 refs;
 
@@ -157,16 +158,16 @@ int __free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
 	key.offset = num_blocks;
 
 	find_free_extent(root, 0, 0, (u64)-1, &ins);
-	init_path(&path);
-	ret = search_slot(extent_root, &key, &path, -1, 1);
+	btrfs_init_path(&path);
+	ret = btrfs_search_slot(extent_root, &key, &path, -1, 1);
 	if (ret) {
 		printf("failed to find %Lu\n", key.objectid);
-		print_tree(extent_root, extent_root->node);
+		btrfs_print_tree(extent_root, extent_root->node);
 		printf("failed to find %Lu\n", key.objectid);
 		BUG();
 	}
 	item = path.nodes[0]->leaf.items + path.slots[0];
-	ei = (struct extent_item *)(path.nodes[0]->leaf.data +
+	ei = (struct btrfs_extent_item *)(path.nodes[0]->leaf.data +
 				    btrfs_item_offset(item));
 	BUG_ON(ei->refs == 0);
 	refs = btrfs_extent_refs(ei) - 1;
@@ -180,14 +181,14 @@ int __free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
 			BUG_ON(err);
 			radix_tree_preload_end();
 		}
-		ret = del_item(extent_root, &path);
+		ret = btrfs_del_item(extent_root, &path);
 		if (root != extent_root &&
 		    extent_root->last_insert.objectid < blocknr)
 			extent_root->last_insert.objectid = blocknr;
 		if (ret)
 			BUG();
 	}
-	release_path(extent_root, &path);
+	btrfs_release_path(extent_root, &path);
 	finish_current_insert(extent_root);
 	return ret;
 }
@@ -196,10 +197,10 @@ int __free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
  * find all the blocks marked as pending in the radix tree and remove
  * them from the extent map
  */
-static int del_pending_extents(struct ctree_root *extent_root)
+static int del_pending_extents(struct btrfs_root *extent_root)
 {
 	int ret;
-	struct tree_buffer *gang[4];
+	struct btrfs_buffer *gang[4];
 	int i;
 
 	while(1) {
@@ -214,13 +215,13 @@ static int del_pending_extents(struct ctree_root *extent_root)
 			radix_tree_tag_clear(&extent_root->cache_radix,
 						gang[i]->blocknr,
 						CTREE_EXTENT_PENDING_DEL);
-			tree_block_release(extent_root, gang[i]);
+			btrfs_block_release(extent_root, gang[i]);
 		}
 	}
 	return 0;
 }
 
-static int run_pending(struct ctree_root *extent_root)
+static int run_pending(struct btrfs_root *extent_root)
 {
 	while(radix_tree_tagged(&extent_root->cache_radix,
 			        CTREE_EXTENT_PENDING_DEL))
@@ -232,11 +233,11 @@ static int run_pending(struct ctree_root *extent_root)
 /*
  * remove an extent from the root, returns 0 on success
  */
-int free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
+int btrfs_free_extent(struct btrfs_root *root, u64 blocknr, u64 num_blocks)
 {
 	struct btrfs_key key;
-	struct ctree_root *extent_root = root->extent_root;
-	struct tree_buffer *t;
+	struct btrfs_root *extent_root = root->extent_root;
+	struct btrfs_buffer *t;
 	int pending_ret;
 	int ret;
 
@@ -262,11 +263,11 @@ int free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
  * ins->offset == number of blocks
  * Any available blocks before search_start are skipped.
  */
-static int find_free_extent(struct ctree_root *orig_root, u64 num_blocks,
+static int find_free_extent(struct btrfs_root *orig_root, u64 num_blocks,
 			    u64 search_start, u64 search_end,
 			    struct btrfs_key *ins)
 {
-	struct ctree_path path;
+	struct btrfs_path path;
 	struct btrfs_key key;
 	int ret;
 	u64 hole_size = 0;
@@ -274,20 +275,20 @@ static int find_free_extent(struct ctree_root *orig_root, u64 num_blocks,
 	u64 last_block;
 	u64 test_block;
 	int start_found;
-	struct leaf *l;
-	struct ctree_root * root = orig_root->extent_root;
+	struct btrfs_leaf *l;
+	struct btrfs_root * root = orig_root->extent_root;
 	int total_needed = num_blocks;
 
 	total_needed += (btrfs_header_level(&root->node->node.header) + 1) * 3;
 	if (root->last_insert.objectid > search_start)
 		search_start = root->last_insert.objectid;
 check_failed:
-	init_path(&path);
+	btrfs_init_path(&path);
 	ins->objectid = search_start;
 	ins->offset = 0;
 	ins->flags = 0;
 	start_found = 0;
-	ret = search_slot(root, ins, &path, 0, 0);
+	ret = btrfs_search_slot(root, ins, &path, 0, 0);
 	if (ret < 0)
 		goto error;
 
@@ -298,7 +299,7 @@ check_failed:
 		l = &path.nodes[0]->leaf;
 		slot = path.slots[0];
 		if (slot >= btrfs_header_nritems(&l->header)) {
-			ret = next_leaf(root, &path);
+			ret = btrfs_next_leaf(root, &path);
 			if (ret == 0)
 				continue;
 			if (ret < 0)
@@ -336,7 +337,7 @@ check_pending:
 	/* we have to make sure we didn't find an extent that has already
 	 * been allocated by the map tree or the original allocation
 	 */
-	release_path(root, &path);
+	btrfs_release_path(root, &path);
 	BUG_ON(ins->objectid < search_start);
 	for (test_block = ins->objectid;
 	     test_block < ins->objectid + total_needed; test_block++) {
@@ -353,7 +354,7 @@ check_pending:
 	ins->offset = num_blocks;
 	return 0;
 error:
-	release_path(root, &path);
+	btrfs_release_path(root, &path);
 	return ret;
 }
 
@@ -364,13 +365,13 @@ error:
  *
  * returns 0 if everything worked, non-zero otherwise.
  */
-int alloc_extent(struct ctree_root *root, u64 num_blocks, u64 search_start,
+int alloc_extent(struct btrfs_root *root, u64 num_blocks, u64 search_start,
 			 u64 search_end, u64 owner, struct btrfs_key *ins)
 {
 	int ret;
 	int pending_ret;
-	struct ctree_root *extent_root = root->extent_root;
-	struct extent_item extent_item;
+	struct btrfs_root *extent_root = root->extent_root;
+	struct btrfs_extent_item extent_item;
 
 	btrfs_set_extent_refs(&extent_item, 1);
 	btrfs_set_extent_owner(&extent_item, owner);
@@ -390,7 +391,7 @@ int alloc_extent(struct ctree_root *root, u64 num_blocks, u64 search_start,
 	if (ret)
 		return ret;
 
-	ret = insert_item(extent_root, ins, &extent_item,
+	ret = btrfs_insert_item(extent_root, ins, &extent_item,
 			  sizeof(extent_item));
 
 	finish_current_insert(extent_root);
@@ -406,11 +407,11 @@ int alloc_extent(struct ctree_root *root, u64 num_blocks, u64 search_start,
  * helper function to allocate a block for a given tree
  * returns the tree buffer or NULL.
  */
-struct tree_buffer *alloc_free_block(struct ctree_root *root)
+struct btrfs_buffer *btrfs_alloc_free_block(struct btrfs_root *root)
 {
 	struct btrfs_key ins;
 	int ret;
-	struct tree_buffer *buf;
+	struct btrfs_buffer *buf;
 
 	ret = alloc_extent(root, 1, 0, (unsigned long)-1,
 			   btrfs_header_parentid(&root->node->node.header),
@@ -424,10 +425,10 @@ struct tree_buffer *alloc_free_block(struct ctree_root *root)
 	return buf;
 }
 
-int walk_down_tree(struct ctree_root *root, struct ctree_path *path, int *level)
+int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, int *level)
 {
-	struct tree_buffer *next;
-	struct tree_buffer *cur;
+	struct btrfs_buffer *next;
+	struct btrfs_buffer *cur;
 	u64 blocknr;
 	int ret;
 	u32 refs;
@@ -445,33 +446,33 @@ int walk_down_tree(struct ctree_root *root, struct ctree_path *path, int *level)
 		ret = lookup_block_ref(root, blocknr, &refs);
 		if (refs != 1 || *level == 1) {
 			path->slots[*level]++;
-			ret = free_extent(root, blocknr, 1);
+			ret = btrfs_free_extent(root, blocknr, 1);
 			BUG_ON(ret);
 			continue;
 		}
 		BUG_ON(ret);
 		next = read_tree_block(root, blocknr);
 		if (path->nodes[*level-1])
-			tree_block_release(root, path->nodes[*level-1]);
+			btrfs_block_release(root, path->nodes[*level-1]);
 		path->nodes[*level-1] = next;
 		*level = btrfs_header_level(&next->node.header);
 		path->slots[*level] = 0;
 	}
 out:
-	ret = free_extent(root, path->nodes[*level]->blocknr, 1);
-	tree_block_release(root, path->nodes[*level]);
+	ret = btrfs_free_extent(root, path->nodes[*level]->blocknr, 1);
+	btrfs_block_release(root, path->nodes[*level]);
 	path->nodes[*level] = NULL;
 	*level += 1;
 	BUG_ON(ret);
 	return 0;
 }
 
-int walk_up_tree(struct ctree_root *root, struct ctree_path *path, int *level)
+int walk_up_tree(struct btrfs_root *root, struct btrfs_path *path, int *level)
 {
 	int i;
 	int slot;
 	int ret;
-	for(i = *level; i < MAX_LEVEL - 1 && path->nodes[i]; i++) {
+	for(i = *level; i < BTRFS_MAX_LEVEL - 1 && path->nodes[i]; i++) {
 		slot = path->slots[i];
 		if (slot <
 		    btrfs_header_nritems(&path->nodes[i]->node.header)- 1) {
@@ -479,9 +480,9 @@ int walk_up_tree(struct ctree_root *root, struct ctree_path *path, int *level)
 			*level = i;
 			return 0;
 		} else {
-			ret = free_extent(root,
+			ret = btrfs_free_extent(root,
 					  path->nodes[*level]->blocknr, 1);
-			tree_block_release(root, path->nodes[*level]);
+			btrfs_block_release(root, path->nodes[*level]);
 			path->nodes[*level] = NULL;
 			*level = i + 1;
 			BUG_ON(ret);
@@ -490,15 +491,15 @@ int walk_up_tree(struct ctree_root *root, struct ctree_path *path, int *level)
 	return 1;
 }
 
-int btrfs_drop_snapshot(struct ctree_root *root, struct tree_buffer *snap)
+int btrfs_drop_snapshot(struct btrfs_root *root, struct btrfs_buffer *snap)
 {
 	int ret;
 	int level;
-	struct ctree_path path;
+	struct btrfs_path path;
 	int i;
 	int orig_level;
 
-	init_path(&path);
+	btrfs_init_path(&path);
 
 	level = btrfs_header_level(&snap->node.header);
 	orig_level = level;
@@ -514,7 +515,7 @@ int btrfs_drop_snapshot(struct ctree_root *root, struct tree_buffer *snap)
 	}
 	for (i = 0; i <= orig_level; i++) {
 		if (path.nodes[i]) {
-			tree_block_release(root, path.nodes[i]);
+			btrfs_block_release(root, path.nodes[i]);
 		}
 	}