#include "disk-io.h"
#include "print-tree.h"
-static int split_node(struct ctree_root *root, struct ctree_path *path,
+static int split_node(struct btrfs_root *root, struct btrfs_path *path,
int level);
-static int split_leaf(struct ctree_root *root, struct ctree_path *path,
+static int split_leaf(struct btrfs_root *root, struct btrfs_path *path,
int data_size);
-static int push_node_left(struct ctree_root *root, struct tree_buffer *dst,
- struct tree_buffer *src);
-static int balance_node_right(struct ctree_root *root,
- struct tree_buffer *dst_buf,
- struct tree_buffer *src_buf);
-static int del_ptr(struct ctree_root *root, struct ctree_path *path, int level,
+static int push_node_left(struct btrfs_root *root, struct btrfs_buffer *dst,
+ struct btrfs_buffer *src);
+static int balance_node_right(struct btrfs_root *root,
+ struct btrfs_buffer *dst_buf,
+ struct btrfs_buffer *src_buf);
+static int del_ptr(struct btrfs_root *root, struct btrfs_path *path, int level,
int slot);
-inline void init_path(struct ctree_path *p)
+inline void btrfs_init_path(struct btrfs_path *p)
{
memset(p, 0, sizeof(*p));
}
-void release_path(struct ctree_root *root, struct ctree_path *p)
+void btrfs_release_path(struct btrfs_root *root, struct btrfs_path *p)
{
int i;
- for (i = 0; i < MAX_LEVEL; i++) {
+ for (i = 0; i < BTRFS_MAX_LEVEL; i++) {
if (!p->nodes[i])
break;
- tree_block_release(root, p->nodes[i]);
+ btrfs_block_release(root, p->nodes[i]);
}
memset(p, 0, sizeof(*p));
}
-int btrfs_cow_block(struct ctree_root *root,
- struct tree_buffer *buf,
- struct tree_buffer *parent,
+static int btrfs_cow_block(struct btrfs_root *root,
+ struct btrfs_buffer *buf,
+ struct btrfs_buffer *parent,
int parent_slot,
- struct tree_buffer **cow_ret)
+ struct btrfs_buffer **cow_ret)
{
- struct tree_buffer *cow;
+ struct btrfs_buffer *cow;
if (!list_empty(&buf->dirty)) {
*cow_ret = buf;
return 0;
}
- cow = alloc_free_block(root);
- memcpy(&cow->node, &buf->node, sizeof(buf->node));
+ cow = btrfs_alloc_free_block(root);
+ memcpy(&cow->node, &buf->node, root->blocksize);
btrfs_set_header_blocknr(&cow->node.header, cow->blocknr);
*cow_ret = cow;
btrfs_inc_ref(root, buf);
root->node = cow;
cow->count++;
if (buf != root->commit_root)
- free_extent(root, buf->blocknr, 1);
- tree_block_release(root, buf);
+ btrfs_free_extent(root, buf->blocknr, 1);
+ btrfs_block_release(root, buf);
} else {
btrfs_set_node_blockptr(&parent->node, parent_slot,
cow->blocknr);
BUG_ON(list_empty(&parent->dirty));
- free_extent(root, buf->blocknr, 1);
+ btrfs_free_extent(root, buf->blocknr, 1);
}
- tree_block_release(root, buf);
+ btrfs_block_release(root, buf);
return 0;
}
* this returns the address of the start of the last item,
* which is the stop of the leaf data stack
*/
-static inline unsigned int leaf_data_end(struct leaf *leaf)
+static inline unsigned int leaf_data_end(struct btrfs_root *root,
+ struct btrfs_leaf *leaf)
{
u32 nr = btrfs_header_nritems(&leaf->header);
if (nr == 0)
- return sizeof(leaf->data);
+ return BTRFS_LEAF_DATA_SIZE(root);
return btrfs_item_offset(leaf->items + nr - 1);
}
* the start of the leaf data. IOW, how much room
* the leaf has left for both items and data
*/
-int leaf_free_space(struct leaf *leaf)
+int btrfs_leaf_free_space(struct btrfs_root *root, struct btrfs_leaf *leaf)
{
- int data_end = leaf_data_end(leaf);
+ int data_end = leaf_data_end(root, leaf);
int nritems = btrfs_header_nritems(&leaf->header);
char *items_end = (char *)(leaf->items + nritems + 1);
- return (char *)(leaf->data + data_end) - (char *)items_end;
+ return (char *)(btrfs_leaf_data(leaf) + data_end) - (char *)items_end;
}
/*
* compare two keys in a memcmp fashion
*/
-int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
+static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
{
struct btrfs_key k1;
return 0;
}
-int check_node(struct ctree_path *path, int level)
+static int check_node(struct btrfs_root *root, struct btrfs_path *path,
+ int level)
{
int i;
- struct node *parent = NULL;
- struct node *node = &path->nodes[level]->node;
+ struct btrfs_node *parent = NULL;
+ struct btrfs_node *node = &path->nodes[level]->node;
int parent_slot;
u32 nritems = btrfs_header_nritems(&node->header);
BUG_ON(nritems == 0);
if (parent) {
struct btrfs_disk_key *parent_key;
- parent_key = &parent->keys[parent_slot];
- BUG_ON(memcmp(parent_key, node->keys,
+ parent_key = &parent->ptrs[parent_slot].key;
+ BUG_ON(memcmp(parent_key, &node->ptrs[0].key,
sizeof(struct btrfs_disk_key)));
BUG_ON(btrfs_node_blockptr(parent, parent_slot) !=
btrfs_header_blocknr(&node->header));
}
- BUG_ON(nritems > NODEPTRS_PER_BLOCK);
+ BUG_ON(nritems > BTRFS_NODEPTRS_PER_BLOCK(root));
for (i = 0; nritems > 1 && i < nritems - 2; i++) {
struct btrfs_key cpukey;
- btrfs_disk_key_to_cpu(&cpukey, &node->keys[i + 1]);
- BUG_ON(comp_keys(&node->keys[i], &cpukey) >= 0);
+ btrfs_disk_key_to_cpu(&cpukey, &node->ptrs[i + 1].key);
+ BUG_ON(comp_keys(&node->ptrs[i].key, &cpukey) >= 0);
}
return 0;
}
-int check_leaf(struct ctree_path *path, int level)
+static int check_leaf(struct btrfs_root *root, struct btrfs_path *path,
+ int level)
{
int i;
- struct leaf *leaf = &path->nodes[level]->leaf;
- struct node *parent = NULL;
+ struct btrfs_leaf *leaf = &path->nodes[level]->leaf;
+ struct btrfs_node *parent = NULL;
int parent_slot;
u32 nritems = btrfs_header_nritems(&leaf->header);
if (path->nodes[level + 1])
parent = &path->nodes[level + 1]->node;
parent_slot = path->slots[level + 1];
- BUG_ON(leaf_free_space(leaf) < 0);
+ BUG_ON(btrfs_leaf_free_space(root, leaf) < 0);
if (nritems == 0)
return 0;
if (parent) {
struct btrfs_disk_key *parent_key;
- parent_key = &parent->keys[parent_slot];
+ parent_key = &parent->ptrs[parent_slot].key;
BUG_ON(memcmp(parent_key, &leaf->items[0].key,
sizeof(struct btrfs_disk_key)));
BUG_ON(btrfs_node_blockptr(parent, parent_slot) !=
if (i == 0) {
BUG_ON(btrfs_item_offset(leaf->items + i) +
btrfs_item_size(leaf->items + i) !=
- LEAF_DATA_SIZE);
+ BTRFS_LEAF_DATA_SIZE(root));
}
}
return 0;
}
-int check_block(struct ctree_path *path, int level)
+static int check_block(struct btrfs_root *root, struct btrfs_path *path,
+ int level)
{
if (level == 0)
- return check_leaf(path, level);
- return check_node(path, level);
+ return check_leaf(root, path, level);
+ return check_node(root, path, level);
}
/*
*
* slot may point to max if the key is bigger than all of the keys
*/
-int generic_bin_search(char *p, int item_size, struct btrfs_key *key,
+static int generic_bin_search(char *p, int item_size, struct btrfs_key *key,
int max, int *slot)
{
int low = 0;
* simple bin_search frontend that does the right thing for
* leaves vs nodes
*/
-int bin_search(struct node *c, struct btrfs_key *key, int *slot)
+static int bin_search(struct btrfs_node *c, struct btrfs_key *key, int *slot)
{
if (btrfs_is_leaf(c)) {
- struct leaf *l = (struct leaf *)c;
+ struct btrfs_leaf *l = (struct btrfs_leaf *)c;
return generic_bin_search((void *)l->items,
sizeof(struct btrfs_item),
key, btrfs_header_nritems(&c->header),
slot);
} else {
- return generic_bin_search((void *)c->keys,
- sizeof(struct btrfs_disk_key),
+ return generic_bin_search((void *)c->ptrs,
+ sizeof(struct btrfs_key_ptr),
key, btrfs_header_nritems(&c->header),
slot);
}
return -1;
}
-struct tree_buffer *read_node_slot(struct ctree_root *root,
- struct tree_buffer *parent_buf,
+static struct btrfs_buffer *read_node_slot(struct btrfs_root *root,
+ struct btrfs_buffer *parent_buf,
int slot)
{
- struct node *node = &parent_buf->node;
+ struct btrfs_node *node = &parent_buf->node;
if (slot < 0)
return NULL;
if (slot >= btrfs_header_nritems(&node->header))
return read_tree_block(root, btrfs_node_blockptr(node, slot));
}
-static int balance_level(struct ctree_root *root, struct ctree_path *path,
+static int balance_level(struct btrfs_root *root, struct btrfs_path *path,
int level)
{
- struct tree_buffer *right_buf;
- struct tree_buffer *mid_buf;
- struct tree_buffer *left_buf;
- struct tree_buffer *parent_buf = NULL;
- struct node *right = NULL;
- struct node *mid;
- struct node *left = NULL;
- struct node *parent = NULL;
+ struct btrfs_buffer *right_buf;
+ struct btrfs_buffer *mid_buf;
+ struct btrfs_buffer *left_buf;
+ struct btrfs_buffer *parent_buf = NULL;
+ struct btrfs_node *right = NULL;
+ struct btrfs_node *mid;
+ struct btrfs_node *left = NULL;
+ struct btrfs_node *parent = NULL;
int ret = 0;
int wret;
int pslot;
mid = &mid_buf->node;
orig_ptr = btrfs_node_blockptr(mid, orig_slot);
- if (level < MAX_LEVEL - 1)
+ if (level < BTRFS_MAX_LEVEL - 1)
parent_buf = path->nodes[level + 1];
pslot = path->slots[level + 1];
if (!parent_buf) {
- struct tree_buffer *child;
+ struct btrfs_buffer *child;
u64 blocknr = mid_buf->blocknr;
if (btrfs_header_nritems(&mid->header) != 1)
root->node = child;
path->nodes[level] = NULL;
/* once for the path */
- tree_block_release(root, mid_buf);
+ btrfs_block_release(root, mid_buf);
/* once for the root ptr */
- tree_block_release(root, mid_buf);
+ btrfs_block_release(root, mid_buf);
clean_tree_block(root, mid_buf);
- return free_extent(root, blocknr, 1);
+ return btrfs_free_extent(root, blocknr, 1);
}
parent = &parent_buf->node;
- if (btrfs_header_nritems(&mid->header) > NODEPTRS_PER_BLOCK / 4)
+ if (btrfs_header_nritems(&mid->header) >
+ BTRFS_NODEPTRS_PER_BLOCK(root) / 4)
return 0;
left_buf = read_node_slot(root, parent_buf, pslot - 1);
ret = wret;
if (btrfs_header_nritems(&right->header) == 0) {
u64 blocknr = right_buf->blocknr;
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
clean_tree_block(root, right_buf);
right_buf = NULL;
right = NULL;
wret = del_ptr(root, path, level + 1, pslot + 1);
if (wret)
ret = wret;
- wret = free_extent(root, blocknr, 1);
+ wret = btrfs_free_extent(root, blocknr, 1);
if (wret)
ret = wret;
} else {
- memcpy(parent->keys + pslot + 1, right->keys,
+ memcpy(&parent->ptrs[pslot + 1].key,
+ &right->ptrs[0].key,
sizeof(struct btrfs_disk_key));
BUG_ON(list_empty(&parent_buf->dirty));
}
if (btrfs_header_nritems(&mid->header) == 0) {
/* we've managed to empty the middle node, drop it */
u64 blocknr = mid_buf->blocknr;
- tree_block_release(root, mid_buf);
+ btrfs_block_release(root, mid_buf);
clean_tree_block(root, mid_buf);
mid_buf = NULL;
mid = NULL;
wret = del_ptr(root, path, level + 1, pslot);
if (wret)
ret = wret;
- wret = free_extent(root, blocknr, 1);
+ wret = btrfs_free_extent(root, blocknr, 1);
if (wret)
ret = wret;
} else {
/* update the parent key to reflect our changes */
- memcpy(parent->keys + pslot, mid->keys,
+ memcpy(&parent->ptrs[pslot].key, &mid->ptrs[0].key,
sizeof(struct btrfs_disk_key));
BUG_ON(list_empty(&parent_buf->dirty));
}
path->slots[level + 1] -= 1;
path->slots[level] = orig_slot;
if (mid_buf)
- tree_block_release(root, mid_buf);
+ btrfs_block_release(root, mid_buf);
} else {
orig_slot -= btrfs_header_nritems(&left->header);
path->slots[level] = orig_slot;
}
}
/* double check we haven't messed things up */
- check_block(path, level);
+ check_block(root, path, level);
if (orig_ptr != btrfs_node_blockptr(&path->nodes[level]->node,
path->slots[level]))
BUG();
if (right_buf)
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
if (left_buf)
- tree_block_release(root, left_buf);
+ btrfs_block_release(root, left_buf);
return ret;
}
* tree. if ins_len < 0, nodes will be merged as we walk down the tree (if
* possible)
*/
-int search_slot(struct ctree_root *root, struct btrfs_key *key,
- struct ctree_path *p, int ins_len, int cow)
+int btrfs_search_slot(struct btrfs_root *root, struct btrfs_key *key,
+ struct btrfs_path *p, int ins_len, int cow)
{
- struct tree_buffer *b;
- struct tree_buffer *cow_buf;
- struct node *c;
+ struct btrfs_buffer *b;
+ struct btrfs_buffer *cow_buf;
+ struct btrfs_node *c;
int slot;
int ret;
int level;
BUG_ON(!cow && ins_len);
c = &b->node;
p->nodes[level] = b;
- ret = check_block(p, level);
+ ret = check_block(root, p, level);
if (ret)
return -1;
ret = bin_search(c, key, &slot);
slot -= 1;
p->slots[level] = slot;
if (ins_len > 0 && btrfs_header_nritems(&c->header) ==
- NODEPTRS_PER_BLOCK) {
+ BTRFS_NODEPTRS_PER_BLOCK(root)) {
int sret = split_node(root, p, level);
BUG_ON(sret > 0);
if (sret)
}
b = read_tree_block(root, btrfs_node_blockptr(c, slot));
} else {
- struct leaf *l = (struct leaf *)c;
+ struct btrfs_leaf *l = (struct btrfs_leaf *)c;
p->slots[level] = slot;
- if (ins_len > 0 && leaf_free_space(l) <
+ if (ins_len > 0 && btrfs_leaf_free_space(root, l) <
sizeof(struct btrfs_item) + ins_len) {
int sret = split_leaf(root, p, ins_len);
BUG_ON(sret > 0);
* If this fails to write a tree block, it returns -1, but continues
* fixing up the blocks in ram so the tree is consistent.
*/
-static int fixup_low_keys(struct ctree_root *root,
- struct ctree_path *path, struct btrfs_disk_key *key,
+static int fixup_low_keys(struct btrfs_root *root,
+ struct btrfs_path *path, struct btrfs_disk_key *key,
int level)
{
int i;
int ret = 0;
- for (i = level; i < MAX_LEVEL; i++) {
- struct node *t;
+ for (i = level; i < BTRFS_MAX_LEVEL; i++) {
+ struct btrfs_node *t;
int tslot = path->slots[i];
if (!path->nodes[i])
break;
t = &path->nodes[i]->node;
- memcpy(t->keys + tslot, key, sizeof(*key));
+ memcpy(&t->ptrs[tslot].key, key, sizeof(*key));
BUG_ON(list_empty(&path->nodes[i]->dirty));
if (tslot != 0)
break;
* returns 0 if some ptrs were pushed left, < 0 if there was some horrible
* error, and > 0 if there was no room in the left hand block.
*/
-static int push_node_left(struct ctree_root *root, struct tree_buffer *dst_buf,
- struct tree_buffer *src_buf)
+static int push_node_left(struct btrfs_root *root, struct btrfs_buffer *dst_buf,
+ struct btrfs_buffer *src_buf)
{
- struct node *src = &src_buf->node;
- struct node *dst = &dst_buf->node;
+ struct btrfs_node *src = &src_buf->node;
+ struct btrfs_node *dst = &dst_buf->node;
int push_items = 0;
int src_nritems;
int dst_nritems;
src_nritems = btrfs_header_nritems(&src->header);
dst_nritems = btrfs_header_nritems(&dst->header);
- push_items = NODEPTRS_PER_BLOCK - dst_nritems;
+ push_items = BTRFS_NODEPTRS_PER_BLOCK(root) - dst_nritems;
if (push_items <= 0) {
return 1;
}
if (src_nritems < push_items)
push_items = src_nritems;
- memcpy(dst->keys + dst_nritems, src->keys,
- push_items * sizeof(struct btrfs_disk_key));
- memcpy(dst->blockptrs + dst_nritems, src->blockptrs,
- push_items * sizeof(u64));
+ memcpy(dst->ptrs + dst_nritems, src->ptrs,
+ push_items * sizeof(struct btrfs_key_ptr));
if (push_items < src_nritems) {
- memmove(src->keys, src->keys + push_items,
+ memmove(src->ptrs, src->ptrs + push_items,
(src_nritems - push_items) *
- sizeof(struct btrfs_disk_key));
- memmove(src->blockptrs, src->blockptrs + push_items,
- (src_nritems - push_items) * sizeof(u64));
+ sizeof(struct btrfs_key_ptr));
}
btrfs_set_header_nritems(&src->header, src_nritems - push_items);
btrfs_set_header_nritems(&dst->header, dst_nritems + push_items);
*
* this will only push up to 1/2 the contents of the left node over
*/
-static int balance_node_right(struct ctree_root *root,
- struct tree_buffer *dst_buf,
- struct tree_buffer *src_buf)
+static int balance_node_right(struct btrfs_root *root,
+ struct btrfs_buffer *dst_buf,
+ struct btrfs_buffer *src_buf)
{
- struct node *src = &src_buf->node;
- struct node *dst = &dst_buf->node;
+ struct btrfs_node *src = &src_buf->node;
+ struct btrfs_node *dst = &dst_buf->node;
int push_items = 0;
int max_push;
int src_nritems;
src_nritems = btrfs_header_nritems(&src->header);
dst_nritems = btrfs_header_nritems(&dst->header);
- push_items = NODEPTRS_PER_BLOCK - dst_nritems;
+ push_items = BTRFS_NODEPTRS_PER_BLOCK(root) - dst_nritems;
if (push_items <= 0) {
return 1;
}
if (max_push < push_items)
push_items = max_push;
- memmove(dst->keys + push_items, dst->keys,
- dst_nritems * sizeof(struct btrfs_disk_key));
- memmove(dst->blockptrs + push_items, dst->blockptrs,
- dst_nritems * sizeof(u64));
- memcpy(dst->keys, src->keys + src_nritems - push_items,
- push_items * sizeof(struct btrfs_disk_key));
- memcpy(dst->blockptrs, src->blockptrs + src_nritems - push_items,
- push_items * sizeof(u64));
+ memmove(dst->ptrs + push_items, dst->ptrs,
+ dst_nritems * sizeof(struct btrfs_key_ptr));
+ memcpy(dst->ptrs, src->ptrs + src_nritems - push_items,
+ push_items * sizeof(struct btrfs_key_ptr));
btrfs_set_header_nritems(&src->header, src_nritems - push_items);
btrfs_set_header_nritems(&dst->header, dst_nritems + push_items);
*
* returns zero on success or < 0 on failure.
*/
-static int insert_new_root(struct ctree_root *root,
- struct ctree_path *path, int level)
+static int insert_new_root(struct btrfs_root *root,
+ struct btrfs_path *path, int level)
{
- struct tree_buffer *t;
- struct node *lower;
- struct node *c;
+ struct btrfs_buffer *t;
+ struct btrfs_node *lower;
+ struct btrfs_node *c;
struct btrfs_disk_key *lower_key;
BUG_ON(path->nodes[level]);
BUG_ON(path->nodes[level-1] != root->node);
- t = alloc_free_block(root);
+ t = btrfs_alloc_free_block(root);
c = &t->node;
- memset(c, 0, sizeof(c));
+ memset(c, 0, root->blocksize);
btrfs_set_header_nritems(&c->header, 1);
btrfs_set_header_level(&c->header, level);
btrfs_set_header_blocknr(&c->header, t->blocknr);
btrfs_header_parentid(&root->node->node.header));
lower = &path->nodes[level-1]->node;
if (btrfs_is_leaf(lower))
- lower_key = &((struct leaf *)lower)->items[0].key;
+ lower_key = &((struct btrfs_leaf *)lower)->items[0].key;
else
- lower_key = lower->keys;
- memcpy(c->keys, lower_key, sizeof(struct btrfs_disk_key));
+ lower_key = &lower->ptrs[0].key;
+ memcpy(&c->ptrs[0].key, lower_key, sizeof(struct btrfs_disk_key));
btrfs_set_node_blockptr(c, 0, path->nodes[level - 1]->blocknr);
/* the super has an extra ref to root->node */
- tree_block_release(root, root->node);
+ btrfs_block_release(root, root->node);
root->node = t;
t->count++;
path->nodes[level] = t;
*
* returns zero on success and < 0 on any error
*/
-static int insert_ptr(struct ctree_root *root,
- struct ctree_path *path, struct btrfs_disk_key *key,
+static int insert_ptr(struct btrfs_root *root,
+ struct btrfs_path *path, struct btrfs_disk_key *key,
u64 blocknr, int slot, int level)
{
- struct node *lower;
+ struct btrfs_node *lower;
int nritems;
BUG_ON(!path->nodes[level]);
nritems = btrfs_header_nritems(&lower->header);
if (slot > nritems)
BUG();
- if (nritems == NODEPTRS_PER_BLOCK)
+ if (nritems == BTRFS_NODEPTRS_PER_BLOCK(root))
BUG();
if (slot != nritems) {
- memmove(lower->keys + slot + 1, lower->keys + slot,
- (nritems - slot) * sizeof(struct btrfs_disk_key));
- memmove(lower->blockptrs + slot + 1, lower->blockptrs + slot,
- (nritems - slot) * sizeof(u64));
+ memmove(lower->ptrs + slot + 1, lower->ptrs + slot,
+ (nritems - slot) * sizeof(struct btrfs_key_ptr));
}
- memcpy(lower->keys + slot, key, sizeof(struct btrfs_disk_key));
+ memcpy(&lower->ptrs[slot].key, key, sizeof(struct btrfs_disk_key));
btrfs_set_node_blockptr(lower, slot, blocknr);
btrfs_set_header_nritems(&lower->header, nritems + 1);
- if (lower->keys[1].objectid == 0)
- BUG();
BUG_ON(list_empty(&path->nodes[level]->dirty));
return 0;
}
*
* returns 0 on success and < 0 on failure
*/
-static int split_node(struct ctree_root *root, struct ctree_path *path,
+static int split_node(struct btrfs_root *root, struct btrfs_path *path,
int level)
{
- struct tree_buffer *t;
- struct node *c;
- struct tree_buffer *split_buffer;
- struct node *split;
+ struct btrfs_buffer *t;
+ struct btrfs_node *c;
+ struct btrfs_buffer *split_buffer;
+ struct btrfs_node *split;
int mid;
int ret;
int wret;
return ret;
}
c_nritems = btrfs_header_nritems(&c->header);
- split_buffer = alloc_free_block(root);
+ split_buffer = btrfs_alloc_free_block(root);
split = &split_buffer->node;
btrfs_set_header_flags(&split->header, btrfs_header_flags(&c->header));
btrfs_set_header_blocknr(&split->header, split_buffer->blocknr);
btrfs_set_header_parentid(&split->header,
btrfs_header_parentid(&root->node->node.header));
mid = (c_nritems + 1) / 2;
- memcpy(split->keys, c->keys + mid,
- (c_nritems - mid) * sizeof(struct btrfs_disk_key));
- memcpy(split->blockptrs, c->blockptrs + mid,
- (c_nritems - mid) * sizeof(u64));
+ memcpy(split->ptrs, c->ptrs + mid,
+ (c_nritems - mid) * sizeof(struct btrfs_key_ptr));
btrfs_set_header_nritems(&split->header, c_nritems - mid);
btrfs_set_header_nritems(&c->header, mid);
ret = 0;
BUG_ON(list_empty(&t->dirty));
- wret = insert_ptr(root, path, split->keys, split_buffer->blocknr,
- path->slots[level + 1] + 1, level + 1);
+ wret = insert_ptr(root, path, &split->ptrs[0].key,
+ split_buffer->blocknr, path->slots[level + 1] + 1,
+ level + 1);
if (wret)
ret = wret;
if (path->slots[level] >= mid) {
path->slots[level] -= mid;
- tree_block_release(root, t);
+ btrfs_block_release(root, t);
path->nodes[level] = split_buffer;
path->slots[level + 1] += 1;
} else {
- tree_block_release(root, split_buffer);
+ btrfs_block_release(root, split_buffer);
}
return ret;
}
* and nr indicate which items in the leaf to check. This totals up the
* space used both by the item structs and the item data
*/
-static int leaf_space_used(struct leaf *l, int start, int nr)
+static int leaf_space_used(struct btrfs_leaf *l, int start, int nr)
{
int data_len;
int end = start + nr - 1;
* returns 1 if the push failed because the other node didn't have enough
* room, 0 if everything worked out and < 0 if there were major errors.
*/
-static int push_leaf_right(struct ctree_root *root, struct ctree_path *path,
+static int push_leaf_right(struct btrfs_root *root, struct btrfs_path *path,
int data_size)
{
- struct tree_buffer *left_buf = path->nodes[0];
- struct leaf *left = &left_buf->leaf;
- struct leaf *right;
- struct tree_buffer *right_buf;
- struct tree_buffer *upper;
+ struct btrfs_buffer *left_buf = path->nodes[0];
+ struct btrfs_leaf *left = &left_buf->leaf;
+ struct btrfs_leaf *right;
+ struct btrfs_buffer *right_buf;
+ struct btrfs_buffer *upper;
int slot;
int i;
int free_space;
right_buf = read_tree_block(root, btrfs_node_blockptr(&upper->node,
slot + 1));
right = &right_buf->leaf;
- free_space = leaf_free_space(right);
+ free_space = btrfs_leaf_free_space(root, right);
if (free_space < data_size + sizeof(struct btrfs_item)) {
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
return 1;
}
/* cow and double check */
btrfs_cow_block(root, right_buf, upper, slot + 1, &right_buf);
right = &right_buf->leaf;
- free_space = leaf_free_space(right);
+ free_space = btrfs_leaf_free_space(root, right);
if (free_space < data_size + sizeof(struct btrfs_item)) {
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
return 1;
}
push_space += btrfs_item_size(item) + sizeof(*item);
}
if (push_items == 0) {
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
return 1;
}
right_nritems = btrfs_header_nritems(&right->header);
/* push left to right */
push_space = btrfs_item_end(left->items + left_nritems - push_items);
- push_space -= leaf_data_end(left);
+ push_space -= leaf_data_end(root, left);
/* make room in the right data area */
- memmove(right->data + leaf_data_end(right) - push_space,
- right->data + leaf_data_end(right),
- LEAF_DATA_SIZE - leaf_data_end(right));
+ memmove(btrfs_leaf_data(right) + leaf_data_end(root, right) -
+ push_space, btrfs_leaf_data(right) + leaf_data_end(root, right),
+ BTRFS_LEAF_DATA_SIZE(root) - leaf_data_end(root, right));
/* copy from the left data area */
- memcpy(right->data + LEAF_DATA_SIZE - push_space,
- left->data + leaf_data_end(left),
- push_space);
+ memcpy(btrfs_leaf_data(right) + BTRFS_LEAF_DATA_SIZE(root) - push_space,
+ btrfs_leaf_data(left) + leaf_data_end(root, left), push_space);
memmove(right->items + push_items, right->items,
right_nritems * sizeof(struct btrfs_item));
/* copy the items from left to right */
/* update the item pointers */
right_nritems += push_items;
btrfs_set_header_nritems(&right->header, right_nritems);
- push_space = LEAF_DATA_SIZE;
+ push_space = BTRFS_LEAF_DATA_SIZE(root);
for (i = 0; i < right_nritems; i++) {
btrfs_set_item_offset(right->items + i, push_space -
btrfs_item_size(right->items + i));
BUG_ON(list_empty(&left_buf->dirty));
BUG_ON(list_empty(&right_buf->dirty));
- memcpy(upper->node.keys + slot + 1,
+ memcpy(&upper->node.ptrs[slot + 1].key,
&right->items[0].key, sizeof(struct btrfs_disk_key));
BUG_ON(list_empty(&upper->dirty));
/* then fixup the leaf pointer in the path */
if (path->slots[0] >= left_nritems) {
path->slots[0] -= left_nritems;
- tree_block_release(root, path->nodes[0]);
+ btrfs_block_release(root, path->nodes[0]);
path->nodes[0] = right_buf;
path->slots[1] += 1;
} else {
- tree_block_release(root, right_buf);
+ btrfs_block_release(root, right_buf);
}
return 0;
}
* push some data in the path leaf to the left, trying to free up at
* least data_size bytes. returns zero if the push worked, nonzero otherwise
*/
-static int push_leaf_left(struct ctree_root *root, struct ctree_path *path,
+static int push_leaf_left(struct btrfs_root *root, struct btrfs_path *path,
int data_size)
{
- struct tree_buffer *right_buf = path->nodes[0];
- struct leaf *right = &right_buf->leaf;
- struct tree_buffer *t;
- struct leaf *left;
+ struct btrfs_buffer *right_buf = path->nodes[0];
+ struct btrfs_leaf *right = &right_buf->leaf;
+ struct btrfs_buffer *t;
+ struct btrfs_leaf *left;
int slot;
int i;
int free_space;
t = read_tree_block(root, btrfs_node_blockptr(&path->nodes[1]->node,
slot - 1));
left = &t->leaf;
- free_space = leaf_free_space(left);
+ free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) {
- tree_block_release(root, t);
+ btrfs_block_release(root, t);
return 1;
}
/* cow and double check */
btrfs_cow_block(root, t, path->nodes[1], slot - 1, &t);
left = &t->leaf;
- free_space = leaf_free_space(left);
+ free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) {
- tree_block_release(root, t);
+ btrfs_block_release(root, t);
return 1;
}
push_space += btrfs_item_size(item) + sizeof(*item);
}
if (push_items == 0) {
- tree_block_release(root, t);
+ btrfs_block_release(root, t);
return 1;
}
/* push data from right to left */
memcpy(left->items + btrfs_header_nritems(&left->header),
right->items, push_items * sizeof(struct btrfs_item));
- push_space = LEAF_DATA_SIZE -
+ push_space = BTRFS_LEAF_DATA_SIZE(root) -
btrfs_item_offset(right->items + push_items -1);
- memcpy(left->data + leaf_data_end(left) - push_space,
- right->data + btrfs_item_offset(right->items + push_items - 1),
+ memcpy(btrfs_leaf_data(left) + leaf_data_end(root, left) - push_space,
+ btrfs_leaf_data(right) +
+ btrfs_item_offset(right->items + push_items - 1),
push_space);
old_left_nritems = btrfs_header_nritems(&left->header);
BUG_ON(old_left_nritems < 0);
for (i = old_left_nritems; i < old_left_nritems + push_items; i++) {
- u16 ioff = btrfs_item_offset(left->items + i);
- btrfs_set_item_offset(left->items + i, ioff - (LEAF_DATA_SIZE -
+ u32 ioff = btrfs_item_offset(left->items + i);
+ btrfs_set_item_offset(left->items + i, ioff -
+ (BTRFS_LEAF_DATA_SIZE(root) -
btrfs_item_offset(left->items +
old_left_nritems - 1)));
}
/* fixup right node */
push_space = btrfs_item_offset(right->items + push_items - 1) -
- leaf_data_end(right);
- memmove(right->data + LEAF_DATA_SIZE - push_space, right->data +
- leaf_data_end(right), push_space);
+ leaf_data_end(root, right);
+ memmove(btrfs_leaf_data(right) + BTRFS_LEAF_DATA_SIZE(root) -
+ push_space, btrfs_leaf_data(right) +
+ leaf_data_end(root, right), push_space);
memmove(right->items, right->items + push_items,
(btrfs_header_nritems(&right->header) - push_items) *
sizeof(struct btrfs_item));
btrfs_set_header_nritems(&right->header,
btrfs_header_nritems(&right->header) -
push_items);
- push_space = LEAF_DATA_SIZE;
+ push_space = BTRFS_LEAF_DATA_SIZE(root);
for (i = 0; i < btrfs_header_nritems(&right->header); i++) {
btrfs_set_item_offset(right->items + i, push_space -
/* then fixup the leaf pointer in the path */
if (path->slots[0] < push_items) {
path->slots[0] += old_left_nritems;
- tree_block_release(root, path->nodes[0]);
+ btrfs_block_release(root, path->nodes[0]);
path->nodes[0] = t;
path->slots[1] -= 1;
} else {
- tree_block_release(root, t);
+ btrfs_block_release(root, t);
path->slots[0] -= push_items;
}
BUG_ON(path->slots[0] < 0);
*
* returns 0 if all went well and < 0 on failure.
*/
-static int split_leaf(struct ctree_root *root, struct ctree_path *path,
+static int split_leaf(struct btrfs_root *root, struct btrfs_path *path,
int data_size)
{
- struct tree_buffer *l_buf;
- struct leaf *l;
+ struct btrfs_buffer *l_buf;
+ struct btrfs_leaf *l;
u32 nritems;
int mid;
int slot;
- struct leaf *right;
- struct tree_buffer *right_buffer;
+ struct btrfs_leaf *right;
+ struct btrfs_buffer *right_buffer;
int space_needed = data_size + sizeof(struct btrfs_item);
int data_copy_size;
int rt_data_off;
int ret;
int wret;
+ wret = push_leaf_left(root, path, data_size);
+ if (wret < 0)
+ return wret;
+ if (wret) {
+ wret = push_leaf_right(root, path, data_size);
+ if (wret < 0)
+ return wret;
+ }
l_buf = path->nodes[0];
l = &l_buf->leaf;
/* did the pushes work? */
- if (leaf_free_space(l) >= sizeof(struct btrfs_item) + data_size)
+ if (btrfs_leaf_free_space(root, l) >=
+ sizeof(struct btrfs_item) + data_size)
return 0;
if (!path->nodes[1]) {
slot = path->slots[0];
nritems = btrfs_header_nritems(&l->header);
mid = (nritems + 1)/ 2;
- right_buffer = alloc_free_block(root);
+ right_buffer = btrfs_alloc_free_block(root);
BUG_ON(!right_buffer);
BUG_ON(mid == nritems);
right = &right_buffer->leaf;
- memset(right, 0, sizeof(*right));
+ memset(&right->header, 0, sizeof(right->header));
if (mid <= slot) {
/* FIXME, just alloc a new leaf here */
if (leaf_space_used(l, mid, nritems - mid) + space_needed >
- LEAF_DATA_SIZE)
+ BTRFS_LEAF_DATA_SIZE(root))
BUG();
} else {
/* FIXME, just alloc a new leaf here */
if (leaf_space_used(l, 0, mid + 1) + space_needed >
- LEAF_DATA_SIZE)
+ BTRFS_LEAF_DATA_SIZE(root))
BUG();
}
btrfs_set_header_nritems(&right->header, nritems - mid);
btrfs_set_header_level(&right->header, 0);
btrfs_set_header_parentid(&right->header,
btrfs_header_parentid(&root->node->node.header));
- data_copy_size = btrfs_item_end(l->items + mid) - leaf_data_end(l);
+ data_copy_size = btrfs_item_end(l->items + mid) -
+ leaf_data_end(root, l);
memcpy(right->items, l->items + mid,
(nritems - mid) * sizeof(struct btrfs_item));
- memcpy(right->data + LEAF_DATA_SIZE - data_copy_size,
- l->data + leaf_data_end(l), data_copy_size);
- rt_data_off = LEAF_DATA_SIZE - btrfs_item_end(l->items + mid);
+ memcpy(btrfs_leaf_data(right) + BTRFS_LEAF_DATA_SIZE(root) -
+ data_copy_size, btrfs_leaf_data(l) +
+ leaf_data_end(root, l), data_copy_size);
+ rt_data_off = BTRFS_LEAF_DATA_SIZE(root) -
+ btrfs_item_end(l->items + mid);
for (i = 0; i < btrfs_header_nritems(&right->header); i++) {
- u16 ioff = btrfs_item_offset(right->items + i);
+ u32 ioff = btrfs_item_offset(right->items + i);
btrfs_set_item_offset(right->items + i, ioff + rt_data_off);
}
BUG_ON(list_empty(&l_buf->dirty));
BUG_ON(path->slots[0] != slot);
if (mid <= slot) {
- tree_block_release(root, path->nodes[0]);
+ btrfs_block_release(root, path->nodes[0]);
path->nodes[0] = right_buffer;
path->slots[0] -= mid;
path->slots[1] += 1;
} else
- tree_block_release(root, right_buffer);
+ btrfs_block_release(root, right_buffer);
BUG_ON(path->slots[0] < 0);
return ret;
}
* Given a key and some data, insert an item into the tree.
* This does all the path init required, making room in the tree if needed.
*/
-int insert_item(struct ctree_root *root, struct btrfs_key *cpu_key,
+int btrfs_insert_item(struct btrfs_root *root, struct btrfs_key *cpu_key,
void *data, int data_size)
{
int ret = 0;
int slot;
int slot_orig;
- struct leaf *leaf;
- struct tree_buffer *leaf_buf;
+ struct btrfs_leaf *leaf;
+ struct btrfs_buffer *leaf_buf;
u32 nritems;
unsigned int data_end;
- struct ctree_path path;
+ struct btrfs_path path;
struct btrfs_disk_key disk_key;
btrfs_cpu_key_to_disk(&disk_key, cpu_key);
/* create a root if there isn't one */
if (!root->node)
BUG();
- init_path(&path);
- ret = search_slot(root, cpu_key, &path, data_size, 1);
+ btrfs_init_path(&path);
+ ret = btrfs_search_slot(root, cpu_key, &path, data_size, 1);
if (ret == 0) {
- release_path(root, &path);
+ btrfs_release_path(root, &path);
return -EEXIST;
}
if (ret < 0)
leaf = &leaf_buf->leaf;
nritems = btrfs_header_nritems(&leaf->header);
- data_end = leaf_data_end(leaf);
+ data_end = leaf_data_end(root, leaf);
- if (leaf_free_space(leaf) < sizeof(struct btrfs_item) + data_size)
+ if (btrfs_leaf_free_space(root, leaf) <
+ sizeof(struct btrfs_item) + data_size)
BUG();
slot = path.slots[0];
*/
/* first correct the data pointers */
for (i = slot; i < nritems; i++) {
- u16 ioff = btrfs_item_offset(leaf->items + i);
+ u32 ioff = btrfs_item_offset(leaf->items + i);
btrfs_set_item_offset(leaf->items + i,
ioff - data_size);
}
(nritems - slot) * sizeof(struct btrfs_item));
/* shift the data */
- memmove(leaf->data + data_end - data_size, leaf->data +
+ memmove(btrfs_leaf_data(leaf) + data_end - data_size,
+ btrfs_leaf_data(leaf) +
data_end, old_data - data_end);
data_end = old_data;
}
sizeof(struct btrfs_disk_key));
btrfs_set_item_offset(leaf->items + slot, data_end - data_size);
btrfs_set_item_size(leaf->items + slot, data_size);
- memcpy(leaf->data + data_end - data_size, data, data_size);
+ memcpy(btrfs_leaf_data(leaf) + data_end - data_size, data, data_size);
btrfs_set_header_nritems(&leaf->header, nritems + 1);
ret = 0;
ret = fixup_low_keys(root, &path, &disk_key, 1);
BUG_ON(list_empty(&leaf_buf->dirty));
- if (leaf_free_space(leaf) < 0)
+ if (btrfs_leaf_free_space(root, leaf) < 0)
BUG();
- check_leaf(&path, 0);
+ check_leaf(root, &path, 0);
out:
- release_path(root, &path);
+ btrfs_release_path(root, &path);
return ret;
}
* continuing all the way the root if required. The root is converted into
* a leaf if all the nodes are emptied.
*/
-static int del_ptr(struct ctree_root *root, struct ctree_path *path, int level,
+static int del_ptr(struct btrfs_root *root, struct btrfs_path *path, int level,
int slot)
{
- struct node *node;
- struct tree_buffer *parent = path->nodes[level];
+ struct btrfs_node *node;
+ struct btrfs_buffer *parent = path->nodes[level];
u32 nritems;
int ret = 0;
int wret;
node = &parent->node;
nritems = btrfs_header_nritems(&node->header);
if (slot != nritems -1) {
- memmove(node->keys + slot, node->keys + slot + 1,
- sizeof(struct btrfs_disk_key) * (nritems - slot - 1));
- memmove(node->blockptrs + slot,
- node->blockptrs + slot + 1,
- sizeof(u64) * (nritems - slot - 1));
+ memmove(node->ptrs + slot, node->ptrs + slot + 1,
+ sizeof(struct btrfs_key_ptr) * (nritems - slot - 1));
}
nritems--;
btrfs_set_header_nritems(&node->header, nritems);
/* just turn the root into a leaf and break */
btrfs_set_header_level(&root->node->node.header, 0);
} else if (slot == 0) {
- wret = fixup_low_keys(root, path, node->keys, level + 1);
+ wret = fixup_low_keys(root, path, &node->ptrs[0].key,
+ level + 1);
if (wret)
ret = wret;
}
* delete the item at the leaf level in path. If that empties
* the leaf, remove it from the tree
*/
-int del_item(struct ctree_root *root, struct ctree_path *path)
+int btrfs_del_item(struct btrfs_root *root, struct btrfs_path *path)
{
int slot;
- struct leaf *leaf;
- struct tree_buffer *leaf_buf;
+ struct btrfs_leaf *leaf;
+ struct btrfs_buffer *leaf_buf;
int doff;
int dsize;
int ret = 0;
if (slot != nritems - 1) {
int i;
- int data_end = leaf_data_end(leaf);
- memmove(leaf->data + data_end + dsize,
- leaf->data + data_end,
+ int data_end = leaf_data_end(root, leaf);
+ memmove(btrfs_leaf_data(leaf) + data_end + dsize,
+ btrfs_leaf_data(leaf) + data_end,
doff - data_end);
for (i = slot + 1; i < nritems; i++) {
- u16 ioff = btrfs_item_offset(leaf->items + i);
+ u32 ioff = btrfs_item_offset(leaf->items + i);
btrfs_set_item_offset(leaf->items + i, ioff + dsize);
}
memmove(leaf->items + slot, leaf->items + slot + 1,
wret = del_ptr(root, path, 1, path->slots[1]);
if (wret)
ret = wret;
- wret = free_extent(root, leaf_buf->blocknr, 1);
+ wret = btrfs_free_extent(root, leaf_buf->blocknr, 1);
if (wret)
ret = wret;
}
BUG_ON(list_empty(&leaf_buf->dirty));
/* delete the leaf if it is mostly empty */
- if (used < LEAF_DATA_SIZE / 3) {
+ if (used < BTRFS_LEAF_DATA_SIZE(root) / 3) {
/* push_leaf_left fixes the path.
* make sure the path still points to our leaf
* for possible call to del_ptr below
wret = del_ptr(root, path, 1, slot);
if (wret)
ret = wret;
- tree_block_release(root, leaf_buf);
- wret = free_extent(root, blocknr, 1);
+ btrfs_block_release(root, leaf_buf);
+ wret = btrfs_free_extent(root, blocknr, 1);
if (wret)
ret = wret;
} else {
- tree_block_release(root, leaf_buf);
+ btrfs_block_release(root, leaf_buf);
}
}
}
* returns 0 if it found something or 1 if there are no greater leaves.
* returns < 0 on io errors.
*/
-int next_leaf(struct ctree_root *root, struct ctree_path *path)
+int btrfs_next_leaf(struct btrfs_root *root, struct btrfs_path *path)
{
int slot;
int level = 1;
u64 blocknr;
- struct tree_buffer *c;
- struct tree_buffer *next = NULL;
+ struct btrfs_buffer *c;
+ struct btrfs_buffer *next = NULL;
- while(level < MAX_LEVEL) {
+ while(level < BTRFS_MAX_LEVEL) {
if (!path->nodes[level])
return 1;
slot = path->slots[level] + 1;
}
blocknr = btrfs_node_blockptr(&c->node, slot);
if (next)
- tree_block_release(root, next);
+ btrfs_block_release(root, next);
next = read_tree_block(root, blocknr);
break;
}
while(1) {
level--;
c = path->nodes[level];
- tree_block_release(root, c);
+ btrfs_block_release(root, c);
path->nodes[level] = next;
path->slots[level] = 0;
if (!level)
projects / firefly-linux-kernel-4.4.55.git / blobdiff