btrfs_root *extent_root);
static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, u64 blocknr)
+ *root, u64 blocknr, u64 num_blocks)
{
- struct btrfs_path path;
+ struct btrfs_path *path;
int ret;
struct btrfs_key key;
struct btrfs_leaf *l;
find_free_extent(trans, root->fs_info->extent_root, 0, 0, (u64)-1,
&ins);
- btrfs_init_path(&path);
+ path = btrfs_alloc_path();
+ BUG_ON(!path);
+ btrfs_init_path(path);
key.objectid = blocknr;
key.flags = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
- key.offset = 1;
- ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, &path,
+ key.offset = num_blocks;
+ ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
0, 1);
if (ret != 0)
BUG();
BUG_ON(ret != 0);
- l = btrfs_buffer_leaf(path.nodes[0]);
- item = btrfs_item_ptr(l, path.slots[0], struct btrfs_extent_item);
+ l = btrfs_buffer_leaf(path->nodes[0]);
+ item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item);
refs = btrfs_extent_refs(item);
btrfs_set_extent_refs(item, refs + 1);
- mark_buffer_dirty(path.nodes[0]);
+ btrfs_mark_buffer_dirty(path->nodes[0]);
- btrfs_release_path(root->fs_info->extent_root, &path);
+ btrfs_release_path(root->fs_info->extent_root, path);
+ btrfs_free_path(path);
finish_current_insert(trans, root->fs_info->extent_root);
del_pending_extents(trans, root->fs_info->extent_root);
return 0;
}
static int lookup_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, u64 blocknr, u32 *refs)
+ *root, u64 blocknr, u64 num_blocks, u32 *refs)
{
- struct btrfs_path path;
+ struct btrfs_path *path;
int ret;
struct btrfs_key key;
struct btrfs_leaf *l;
struct btrfs_extent_item *item;
- btrfs_init_path(&path);
+
+ path = btrfs_alloc_path();
+ btrfs_init_path(path);
key.objectid = blocknr;
- key.offset = 1;
+ key.offset = num_blocks;
key.flags = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
- ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, &path,
+ ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
0, 0);
if (ret != 0)
BUG();
- l = btrfs_buffer_leaf(path.nodes[0]);
- item = btrfs_item_ptr(l, path.slots[0], struct btrfs_extent_item);
+ l = btrfs_buffer_leaf(path->nodes[0]);
+ item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item);
*refs = btrfs_extent_refs(item);
- btrfs_release_path(root->fs_info->extent_root, &path);
+ btrfs_release_path(root->fs_info->extent_root, path);
+ btrfs_free_path(path);
return 0;
}
{
u64 blocknr;
struct btrfs_node *buf_node;
+ struct btrfs_leaf *buf_leaf;
+ struct btrfs_disk_key *key;
+ struct btrfs_file_extent_item *fi;
int i;
+ int leaf;
+ int ret;
if (!root->ref_cows)
return 0;
buf_node = btrfs_buffer_node(buf);
- if (btrfs_is_leaf(buf_node))
- return 0;
-
+ leaf = btrfs_is_leaf(buf_node);
+ buf_leaf = btrfs_buffer_leaf(buf);
for (i = 0; i < btrfs_header_nritems(&buf_node->header); i++) {
- blocknr = btrfs_node_blockptr(buf_node, i);
- inc_block_ref(trans, root, blocknr);
+ if (leaf) {
+ key = &buf_leaf->items[i].key;
+ if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
+ continue;
+ fi = btrfs_item_ptr(buf_leaf, i,
+ struct btrfs_file_extent_item);
+ ret = inc_block_ref(trans, root,
+ btrfs_file_extent_disk_blocknr(fi),
+ btrfs_file_extent_disk_num_blocks(fi));
+ BUG_ON(ret);
+ } else {
+ blocknr = btrfs_node_blockptr(buf_node, i);
+ ret = inc_block_ref(trans, root, blocknr, 1);
+ BUG_ON(ret);
+ }
}
return 0;
}
struct btrfs_header *header;
struct buffer_head *bh;
- bh = sb_find_get_block(root->fs_info->sb, blocknr);
- if (bh) {
- header = btrfs_buffer_header(bh);
- if (btrfs_header_generation(header) ==
- root->fs_info->running_transaction->transid) {
- brelse(bh);
- return 0;
+ if (!pending) {
+ bh = btrfs_find_tree_block(root, blocknr);
+ if (bh) {
+ if (buffer_uptodate(bh)) {
+ u64 transid =
+ root->fs_info->running_transaction->transid;
+ header = btrfs_buffer_header(bh);
+ if (btrfs_header_generation(header) ==
+ transid) {
+ btrfs_block_release(root, bh);
+ return 0;
+ }
+ }
+ btrfs_block_release(root, bh);
}
- brelse(bh);
- }
- if (pending)
- err = set_radix_bit(&root->fs_info->pending_del_radix, blocknr);
- else
err = set_radix_bit(&root->fs_info->pinned_radix, blocknr);
+ } else {
+ err = set_radix_bit(&root->fs_info->pending_del_radix, blocknr);
+ }
BUG_ON(err);
return 0;
}
static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 blocknr, u64 num_blocks, int pin)
{
- struct btrfs_path path;
+ struct btrfs_path *path;
struct btrfs_key key;
struct btrfs_fs_info *info = root->fs_info;
struct btrfs_root *extent_root = info->extent_root;
key.offset = num_blocks;
find_free_extent(trans, root, 0, 0, (u64)-1, &ins);
- btrfs_init_path(&path);
- ret = btrfs_search_slot(trans, extent_root, &key, &path, -1, 1);
+ path = btrfs_alloc_path();
+ BUG_ON(!path);
+ btrfs_init_path(path);
+
+ ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
if (ret) {
printk("failed to find %Lu\n", key.objectid);
btrfs_print_tree(extent_root, extent_root->node);
printk("failed to find %Lu\n", key.objectid);
BUG();
}
- ei = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+ ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_extent_item);
BUG_ON(ei->refs == 0);
refs = btrfs_extent_refs(ei) - 1;
btrfs_set_extent_refs(ei, refs);
+ btrfs_mark_buffer_dirty(path->nodes[0]);
if (refs == 0) {
u64 super_blocks_used;
super_blocks_used = btrfs_super_blocks_used(info->disk_super);
btrfs_set_super_blocks_used(info->disk_super,
super_blocks_used - num_blocks);
- ret = btrfs_del_item(trans, extent_root, &path);
- if (extent_root->fs_info->last_insert.objectid > blocknr)
- extent_root->fs_info->last_insert.objectid = blocknr;
+ ret = btrfs_del_item(trans, extent_root, path);
if (ret)
BUG();
}
- mark_buffer_dirty(path.nodes[0]);
- btrfs_release_path(extent_root, &path);
+ btrfs_release_path(extent_root, path);
+ btrfs_free_path(path);
finish_current_insert(trans, extent_root);
return ret;
}
*root, u64 blocknr, u64 num_blocks, int pin)
{
struct btrfs_root *extent_root = root->fs_info->extent_root;
- struct buffer_head *t;
int pending_ret;
int ret;
if (root == extent_root) {
- t = find_tree_block(root, blocknr);
pin_down_block(root, blocknr, 1);
return 0;
}
*orig_root, u64 num_blocks, u64 search_start, u64
search_end, struct btrfs_key *ins)
{
- struct btrfs_path path;
+ struct btrfs_path *path;
struct btrfs_key key;
int ret;
u64 hole_size = 0;
int total_needed = num_blocks;
int level;
+ path = btrfs_alloc_path();
+ ins->flags = 0;
+ btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
+
level = btrfs_header_level(btrfs_buffer_header(root->node));
total_needed += (level + 1) * 3;
+ if (root->fs_info->last_insert.objectid == 0 && search_end == (u64)-1) {
+ struct btrfs_disk_key *last_key;
+ btrfs_init_path(path);
+ ins->objectid = (u64)-1;
+ ins->offset = (u64)-1;
+ ret = btrfs_search_slot(trans, root, ins, path, 0, 0);
+ if (ret < 0)
+ goto error;
+ BUG_ON(ret == 0);
+ if (path->slots[0] > 0)
+ path->slots[0]--;
+ l = btrfs_buffer_leaf(path->nodes[0]);
+ last_key = &l->items[path->slots[0]].key;
+ search_start = btrfs_disk_key_objectid(last_key);
+ }
if (root->fs_info->last_insert.objectid > search_start)
search_start = root->fs_info->last_insert.objectid;
- ins->flags = 0;
- btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
-
check_failed:
- btrfs_init_path(&path);
+ btrfs_init_path(path);
ins->objectid = search_start;
ins->offset = 0;
start_found = 0;
- ret = btrfs_search_slot(trans, root, ins, &path, 0, 0);
+ ret = btrfs_search_slot(trans, root, ins, path, 0, 0);
if (ret < 0)
goto error;
- if (path.slots[0] > 0)
- path.slots[0]--;
+ if (path->slots[0] > 0)
+ path->slots[0]--;
while (1) {
- l = btrfs_buffer_leaf(path.nodes[0]);
- slot = path.slots[0];
+ l = btrfs_buffer_leaf(path->nodes[0]);
+ slot = path->slots[0];
if (slot >= btrfs_header_nritems(&l->header)) {
- ret = btrfs_next_leaf(root, &path);
+ ret = btrfs_next_leaf(root, path);
if (ret == 0)
continue;
if (ret < 0)
}
start_found = 1;
last_block = key.objectid + key.offset;
- path.slots[0]++;
+ path->slots[0]++;
}
// FIXME -ENOSPC
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
*/
- btrfs_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++) {
root->fs_info->current_insert.flags = 0;
root->fs_info->last_insert.objectid = ins->objectid;
ins->offset = num_blocks;
+ btrfs_free_path(path);
return 0;
error:
- btrfs_release_path(root, &path);
+ btrfs_release_path(root, path);
+ btrfs_free_path(path);
return ret;
}
BUG();
return NULL;
}
- buf = find_tree_block(root, ins.objectid);
+ buf = btrfs_find_create_tree_block(root, ins.objectid);
set_buffer_uptodate(buf);
return buf;
}
+static int drop_leaf_ref(struct btrfs_trans_handle *trans,
+ struct btrfs_root *root, struct buffer_head *cur)
+{
+ struct btrfs_disk_key *key;
+ struct btrfs_leaf *leaf;
+ struct btrfs_file_extent_item *fi;
+ int i;
+ int nritems;
+ int ret;
+
+ BUG_ON(!btrfs_is_leaf(btrfs_buffer_node(cur)));
+ leaf = btrfs_buffer_leaf(cur);
+ nritems = btrfs_header_nritems(&leaf->header);
+ for (i = 0; i < nritems; i++) {
+ key = &leaf->items[i].key;
+ if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
+ continue;
+ fi = btrfs_item_ptr(leaf, i, struct btrfs_file_extent_item);
+ /*
+ * FIXME make sure to insert a trans record that
+ * repeats the snapshot del on crash
+ */
+ ret = btrfs_free_extent(trans, root,
+ btrfs_file_extent_disk_blocknr(fi),
+ btrfs_file_extent_disk_num_blocks(fi),
+ 0);
+ BUG_ON(ret);
+ }
+ return 0;
+}
+
/*
* helper function for drop_snapshot, this walks down the tree dropping ref
* counts as it goes.
int ret;
u32 refs;
+ WARN_ON(*level < 0);
+ WARN_ON(*level >= BTRFS_MAX_LEVEL);
ret = lookup_block_ref(trans, root, path->nodes[*level]->b_blocknr,
- &refs);
+ 1, &refs);
BUG_ON(ret);
if (refs > 1)
goto out;
/*
* walk down to the last node level and free all the leaves
*/
- while(*level > 0) {
+ while(*level >= 0) {
+ WARN_ON(*level < 0);
+ WARN_ON(*level >= BTRFS_MAX_LEVEL);
cur = path->nodes[*level];
+ if (btrfs_header_level(btrfs_buffer_header(cur)) != *level)
+ WARN_ON(1);
if (path->slots[*level] >=
btrfs_header_nritems(btrfs_buffer_header(cur)))
break;
+ if (*level == 0) {
+ ret = drop_leaf_ref(trans, root, cur);
+ BUG_ON(ret);
+ break;
+ }
blocknr = btrfs_node_blockptr(btrfs_buffer_node(cur),
path->slots[*level]);
- ret = lookup_block_ref(trans, root, blocknr, &refs);
- if (refs != 1 || *level == 1) {
+ ret = lookup_block_ref(trans, root, blocknr, 1, &refs);
+ BUG_ON(ret);
+ if (refs != 1) {
path->slots[*level]++;
ret = btrfs_free_extent(trans, root, blocknr, 1, 1);
BUG_ON(ret);
continue;
}
- BUG_ON(ret);
next = read_tree_block(root, blocknr);
+ WARN_ON(*level <= 0);
if (path->nodes[*level-1])
btrfs_block_release(root, path->nodes[*level-1]);
path->nodes[*level-1] = next;
path->slots[*level] = 0;
}
out:
- ret = btrfs_free_extent(trans, root, path->nodes[*level]->b_blocknr,
- 1, 1);
+ WARN_ON(*level < 0);
+ WARN_ON(*level >= BTRFS_MAX_LEVEL);
+ ret = btrfs_free_extent(trans, root,
+ path->nodes[*level]->b_blocknr, 1, 1);
btrfs_block_release(root, path->nodes[*level]);
path->nodes[*level] = NULL;
*level += 1;
ret = btrfs_free_extent(trans, root,
path->nodes[*level]->b_blocknr,
1, 1);
+ BUG_ON(ret);
btrfs_block_release(root, path->nodes[*level]);
path->nodes[*level] = NULL;
*level = i + 1;
- BUG_ON(ret);
}
}
return 1;
int ret = 0;
int wret;
int level;
- struct btrfs_path path;
+ struct btrfs_path *path;
int i;
int orig_level;
- btrfs_init_path(&path);
+ path = btrfs_alloc_path();
+ BUG_ON(!path);
+ btrfs_init_path(path);
level = btrfs_header_level(btrfs_buffer_header(snap));
orig_level = level;
- path.nodes[level] = snap;
- path.slots[level] = 0;
+ path->nodes[level] = snap;
+ path->slots[level] = 0;
while(1) {
- wret = walk_down_tree(trans, root, &path, &level);
+ wret = walk_down_tree(trans, root, path, &level);
if (wret > 0)
break;
if (wret < 0)
ret = wret;
- wret = walk_up_tree(trans, root, &path, &level);
+ wret = walk_up_tree(trans, root, path, &level);
if (wret > 0)
break;
if (wret < 0)
ret = wret;
}
for (i = 0; i <= orig_level; i++) {
- if (path.nodes[i]) {
- btrfs_block_release(root, path.nodes[i]);
+ if (path->nodes[i]) {
+ btrfs_block_release(root, path->nodes[i]);
}
}
+ btrfs_free_path(path);
return ret;
}
projects / linux-2.6-block.git / blobdiff