Btrfs: snapshot progress
[linux-2.6-block.git] / fs / btrfs / extent-tree.c
index 0723b7f3f0c3022ac5b938565147cdc3cd956e18..efc604eea0b00883e015511ac9e7b737ec2d92e8 100644 (file)
-#include <stdio.h>
-#include <stdlib.h>
-#include "kerncompat.h"
-#include "radix-tree.h"
+#include <linux/module.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "print-tree.h"
+#include "transaction.h"
 
-/*
- * pending extents are blocks that we're trying to allocate in the extent
- * map while trying to grow the map because of other allocations.  To avoid
- * recursing, they are tagged in the radix tree and cleaned up after
- * other allocations are done.  The pending tag is also used in the same
- * manner for deletes.
- */
-#define CTREE_EXTENT_PENDING_ADD 0
-#define CTREE_EXTENT_PENDING_DEL 1
+static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
+                           *orig_root, u64 num_blocks, u64 search_start, u64
+                           search_end, struct btrfs_key *ins);
+static int finish_current_insert(struct btrfs_trans_handle *trans, struct
+                                btrfs_root *extent_root);
+static int del_pending_extents(struct btrfs_trans_handle *trans, struct
+                              btrfs_root *extent_root);
 
-static int inc_block_ref(struct ctree_root *root, u64 blocknr)
+static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
+                        *root, u64 blocknr, u64 num_blocks)
 {
-       struct ctree_path path;
+       struct btrfs_path *path;
        int ret;
-       struct key key;
-       struct leaf *l;
-       struct extent_item *item;
-       init_path(&path);
+       struct btrfs_key key;
+       struct btrfs_leaf *l;
+       struct btrfs_extent_item *item;
+       struct btrfs_key ins;
+       u32 refs;
+
+       find_free_extent(trans, root->fs_info->extent_root, 0, 0, (u64)-1,
+                        &ins);
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
+       btrfs_init_path(path);
        key.objectid = blocknr;
        key.flags = 0;
-       key.offset = 1;
-       ret = search_slot(root->extent_root, &key, &path, 0, 1);
+       btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
+       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 = &path.nodes[0]->leaf;
-       item = (struct extent_item *)(l->data +
-                                     l->items[path.slots[0]].offset);
-       item->refs++;
+       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);
+       btrfs_mark_buffer_dirty(path->nodes[0]);
 
-       BUG_ON(list_empty(&path.nodes[0]->dirty));
-       release_path(root->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 ctree_root *root, u64 blocknr, int *refs)
+static int lookup_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
+                           *root, u64 blocknr, u64 num_blocks, u32 *refs)
 {
-       struct ctree_path path;
+       struct btrfs_path *path;
        int ret;
-       struct key key;
-       struct leaf *l;
-       struct extent_item *item;
-       init_path(&path);
+       struct btrfs_key key;
+       struct btrfs_leaf *l;
+       struct btrfs_extent_item *item;
+
+       path = btrfs_alloc_path();
+       btrfs_init_path(path);
        key.objectid = blocknr;
+       key.offset = num_blocks;
        key.flags = 0;
-       key.offset = 1;
-       ret = search_slot(root->extent_root, &key, &path, 0, 0);
+       btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
+       ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
+                               0, 0);
        if (ret != 0)
                BUG();
-       l = &path.nodes[0]->leaf;
-       item = (struct extent_item *)(l->data +
-                                     l->items[path.slots[0]].offset);
-       *refs = item->refs;
-       release_path(root->extent_root, &path);
+       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_free_path(path);
        return 0;
 }
 
-int btrfs_inc_ref(struct ctree_root *root, struct tree_buffer *buf)
+int btrfs_inc_root_ref(struct btrfs_trans_handle *trans,
+                      struct btrfs_root *root)
+{
+       return inc_block_ref(trans, root, root->node->b_blocknr, 1);
+}
+
+int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
+                 struct buffer_head *buf)
 {
        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 == root->extent_root)
-               return 0;
-       if (is_leaf(buf->node.header.flags))
+       if (!root->ref_cows)
                return 0;
-
-       for (i = 0; i < buf->node.header.nritems; i++) {
-               blocknr = buf->node.blockptrs[i];
-               inc_block_ref(root, blocknr);
+       buf_node = btrfs_buffer_node(buf);
+       leaf = btrfs_is_leaf(buf_node);
+       buf_leaf = btrfs_buffer_leaf(buf);
+       for (i = 0; i < btrfs_header_nritems(&buf_node->header); i++) {
+               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;
 }
 
-int btrfs_finish_extent_commit(struct ctree_root *root)
+int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
+                              btrfs_root *root)
 {
-       struct ctree_root *extent_root = root->extent_root;
        unsigned long gang[8];
+       u64 first = 0;
        int ret;
        int i;
+       struct radix_tree_root *pinned_radix = &root->fs_info->pinned_radix;
 
        while(1) {
-               ret = radix_tree_gang_lookup(&extent_root->pinned_radix,
-                                                (void **)gang, 0,
-                                                ARRAY_SIZE(gang));
+               ret = find_first_radix_bit(pinned_radix, gang,
+                                          ARRAY_SIZE(gang));
                if (!ret)
                        break;
-               for (i = 0; i < ret; i++)
-                       radix_tree_delete(&extent_root->pinned_radix, gang[i]);
+               if (!first)
+                       first = gang[0];
+               for (i = 0; i < ret; i++) {
+                       clear_radix_bit(pinned_radix, gang[i]);
+               }
+       }
+       if (root->fs_info->last_insert.objectid > first)
+               root->fs_info->last_insert.objectid = first;
+       root->fs_info->last_insert.offset = 0;
+       return 0;
+}
+
+static int finish_current_insert(struct btrfs_trans_handle *trans, struct
+                                btrfs_root *extent_root)
+{
+       struct btrfs_key ins;
+       struct btrfs_extent_item extent_item;
+       int i;
+       int ret;
+       u64 super_blocks_used;
+       struct btrfs_fs_info *info = extent_root->fs_info;
+
+       btrfs_set_extent_refs(&extent_item, 1);
+       btrfs_set_extent_owner(&extent_item,
+               btrfs_header_parentid(btrfs_buffer_header(extent_root->node)));
+       ins.offset = 1;
+       ins.flags = 0;
+       btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY);
+
+       for (i = 0; i < extent_root->fs_info->current_insert.flags; i++) {
+               ins.objectid = extent_root->fs_info->current_insert.objectid +
+                               i;
+               super_blocks_used = btrfs_super_blocks_used(info->disk_super);
+               btrfs_set_super_blocks_used(info->disk_super,
+                                           super_blocks_used + 1);
+               ret = btrfs_insert_item(trans, extent_root, &ins, &extent_item,
+                                       sizeof(extent_item));
+               BUG_ON(ret);
+       }
+       extent_root->fs_info->current_insert.offset = 0;
+       return 0;
+}
+
+static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
+{
+       int err;
+       struct btrfs_header *header;
+       struct buffer_head *bh;
+
+       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);
+               }
+               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;
 }
 
 /*
  * 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_trans_handle *trans, struct btrfs_root
+                        *root, u64 blocknr, u64 num_blocks, int pin)
 {
-       struct ctree_path path;
-       struct key key;
-       struct ctree_root *extent_root = root->extent_root;
+       struct btrfs_path *path;
+       struct btrfs_key key;
+       struct btrfs_fs_info *info = root->fs_info;
+       struct btrfs_root *extent_root = info->extent_root;
        int ret;
-       struct item *item;
-       struct extent_item *ei;
+       struct btrfs_extent_item *ei;
+       struct btrfs_key ins;
+       u32 refs;
+
        key.objectid = blocknr;
        key.flags = 0;
+       btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
        key.offset = num_blocks;
 
-       init_path(&path);
-       ret = search_slot(extent_root, &key, &path, -1, 1);
+       find_free_extent(trans, root, 0, 0, (u64)-1, &ins);
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
+       btrfs_init_path(path);
+
+       ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
        if (ret) {
-               printf("failed to find %Lu\n", key.objectid);
-               print_tree(extent_root, extent_root->node);
-               printf("failed to find %Lu\n", key.objectid);
+               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();
        }
-       item = path.nodes[0]->leaf.items + path.slots[0];
-       ei = (struct extent_item *)(path.nodes[0]->leaf.data + item->offset);
+       ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
+                           struct btrfs_extent_item);
        BUG_ON(ei->refs == 0);
-       ei->refs--;
-       if (ei->refs == 0) {
-               if (root == extent_root) {
-                       int err;
-                       radix_tree_preload(GFP_KERNEL);
-                       err = radix_tree_insert(&extent_root->pinned_radix,
-                                         blocknr, (void *)blocknr);
-                       BUG_ON(err);
-                       radix_tree_preload_end();
+       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;
+
+               if (pin) {
+                       ret = pin_down_block(root, blocknr, 0);
+                       BUG_ON(ret);
                }
-               ret = del_item(extent_root, &path);
+
+               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 (ret)
                        BUG();
        }
-       release_path(extent_root, &path);
+       btrfs_release_path(extent_root, path);
+       btrfs_free_path(path);
+       finish_current_insert(trans, extent_root);
        return ret;
 }
 
-/*
- * insert all of the pending extents reserved during the original
- * allocation.  (CTREE_EXTENT_PENDING).  Returns zero if it all worked out
- */
-static int insert_pending_extents(struct ctree_root *extent_root)
-{
-       int ret;
-       struct key key;
-       struct extent_item item;
-       struct tree_buffer *gang[4];
-       int i;
-
-       // FIXME -ENOSPC
-       item.owner = extent_root->node->node.header.parentid;
-       item.refs = 1;
-       while(1) {
-               ret = radix_tree_gang_lookup_tag(&extent_root->cache_radix,
-                                                (void **)gang, 0,
-                                                ARRAY_SIZE(gang),
-                                                CTREE_EXTENT_PENDING_ADD);
-               if (!ret)
-                       break;
-               for (i = 0; i < ret; i++) {
-                       key.objectid = gang[i]->blocknr;
-                       key.flags = 0;
-                       key.offset = 1;
-                       ret = insert_item(extent_root, &key, &item,
-                                         sizeof(item));
-                       if (ret) {
-                               printf("%Lu already in tree\n", key.objectid);
-                               print_tree(extent_root, extent_root->node);
-                               BUG();
-                               // FIXME undo it and return sane
-                               return ret;
-                       }
-                       radix_tree_tag_clear(&extent_root->cache_radix,
-                                            gang[i]->blocknr,
-                                            CTREE_EXTENT_PENDING_ADD);
-                       tree_block_release(extent_root, gang[i]);
-               }
-       }
-       return 0;
-}
-
 /*
  * 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_trans_handle *trans, struct
+                              btrfs_root *extent_root)
 {
        int ret;
-       struct tree_buffer *gang[4];
+       int wret;
+       int err = 0;
+       unsigned long gang[4];
        int i;
+       struct radix_tree_root *pending_radix;
+       struct radix_tree_root *pinned_radix;
+
+       pending_radix = &extent_root->fs_info->pending_del_radix;
+       pinned_radix = &extent_root->fs_info->pinned_radix;
 
        while(1) {
-               ret = radix_tree_gang_lookup_tag(&extent_root->cache_radix,
-                                                (void **)gang, 0,
-                                                ARRAY_SIZE(gang),
-                                                CTREE_EXTENT_PENDING_DEL);
+               ret = find_first_radix_bit(pending_radix, gang,
+                                          ARRAY_SIZE(gang));
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
-                       ret = __free_extent(extent_root, gang[i]->blocknr, 1);
-                       radix_tree_tag_clear(&extent_root->cache_radix,
-                                               gang[i]->blocknr,
-                                               CTREE_EXTENT_PENDING_DEL);
-                       tree_block_release(extent_root, gang[i]);
+                       wret = set_radix_bit(pinned_radix, gang[i]);
+                       BUG_ON(wret);
+                       wret = clear_radix_bit(pending_radix, gang[i]);
+                       BUG_ON(wret);
+                       wret = __free_extent(trans, extent_root,
+                                            gang[i], 1, 0);
+                       if (wret)
+                               err = wret;
                }
        }
-       return 0;
+       return err;
 }
 
-static int run_pending(struct ctree_root *extent_root)
-{
-       while(radix_tree_tagged(&extent_root->cache_radix,
-                               CTREE_EXTENT_PENDING_DEL) ||
-             radix_tree_tagged(&extent_root->cache_radix,
-                               CTREE_EXTENT_PENDING_ADD)) {
-               insert_pending_extents(extent_root);
-               del_pending_extents(extent_root);
-       }
-       return 0;
-}
-
-
 /*
  * 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_trans_handle *trans, struct btrfs_root
+                     *root, u64 blocknr, u64 num_blocks, int pin)
 {
-       struct key key;
-       struct ctree_root *extent_root = root->extent_root;
-       struct tree_buffer *t;
+       struct btrfs_root *extent_root = root->fs_info->extent_root;
        int pending_ret;
        int ret;
 
        if (root == extent_root) {
-               t = find_tree_block(root, blocknr);
-               if (radix_tree_tag_get(&root->cache_radix, blocknr,
-                                     CTREE_EXTENT_PENDING_ADD)) {
-                       radix_tree_tag_clear(&root->cache_radix,
-                                            blocknr,
-                                            CTREE_EXTENT_PENDING_ADD);
-                       /* once for us */
-                       tree_block_release(root, t);
-                       /* once for the pending add */
-                       tree_block_release(root, t);
-               } else {
-                       radix_tree_tag_set(&root->cache_radix, blocknr,
-                                  CTREE_EXTENT_PENDING_DEL);
-               }
+               pin_down_block(root, blocknr, 1);
                return 0;
        }
-       key.objectid = blocknr;
-       key.flags = 0;
-       key.offset = num_blocks;
-       ret = __free_extent(root, blocknr, num_blocks);
-       pending_ret = run_pending(root->extent_root);
+       ret = __free_extent(trans, root, blocknr, num_blocks, pin);
+       pending_ret = del_pending_extents(trans, root->fs_info->extent_root);
        return ret ? ret : pending_ret;
 }
 
@@ -268,95 +325,126 @@ int free_extent(struct ctree_root *root, u64 blocknr, u64 num_blocks)
  * walks the btree of allocated extents and find a hole of a given size.
  * The key ins is changed to record the hole:
  * ins->objectid == block start
- * ins->flags = 0
+ * ins->flags = BTRFS_EXTENT_ITEM_KEY
  * 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,
-                           u64 search_start, u64 search_end, struct key *ins)
+static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
+                           *orig_root, u64 num_blocks, u64 search_start, u64
+                           search_end, struct btrfs_key *ins)
 {
-       struct ctree_path path;
-       struct key *key;
+       struct btrfs_path *path;
+       struct btrfs_key key;
        int ret;
        u64 hole_size = 0;
        int slot = 0;
-       u64 last_block;
+       u64 last_block = 0;
+       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->fs_info->extent_root;
+       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;
 
 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(trans, root, ins, path, 0, 0);
        if (ret < 0)
                goto error;
 
+       if (path->slots[0] > 0)
+               path->slots[0]--;
+
        while (1) {
-               l = &path.nodes[0]->leaf;
-               slot = path.slots[0];
-               if (slot >= l->header.nritems) {
-                       ret = next_leaf(root, &path);
+               l = btrfs_buffer_leaf(path->nodes[0]);
+               slot = path->slots[0];
+               if (slot >= btrfs_header_nritems(&l->header)) {
+                       ret = btrfs_next_leaf(root, path);
                        if (ret == 0)
                                continue;
                        if (ret < 0)
                                goto error;
                        if (!start_found) {
                                ins->objectid = search_start;
-                               ins->offset = num_blocks;
+                               ins->offset = (u64)-1;
                                start_found = 1;
                                goto check_pending;
                        }
                        ins->objectid = last_block > search_start ?
                                        last_block : search_start;
-                       ins->offset = num_blocks;
+                       ins->offset = (u64)-1;
                        goto check_pending;
                }
-               key = &l->items[slot].key;
-               if (key->objectid >= search_start) {
+               btrfs_disk_key_to_cpu(&key, &l->items[slot].key);
+               if (key.objectid >= search_start) {
                        if (start_found) {
-                               hole_size = key->objectid - last_block;
-                               if (hole_size > num_blocks) {
+                               if (last_block < search_start)
+                                       last_block = search_start;
+                               hole_size = key.objectid - last_block;
+                               if (hole_size > total_needed) {
                                        ins->objectid = last_block;
-                                       ins->offset = num_blocks;
+                                       ins->offset = hole_size;
                                        goto check_pending;
                                }
-                       } else
-                               start_found = 1;
-                       last_block = key->objectid + key->offset;
+                       }
                }
-               path.slots[0]++;
+               start_found = 1;
+               last_block = key.objectid + key.offset;
+               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
         */
-       release_path(root, &path);
+       btrfs_release_path(root, path);
        BUG_ON(ins->objectid < search_start);
-       if (1 || orig_root->extent_root == orig_root) {
-               BUG_ON(num_blocks != 1);
-               if ((root->current_insert.objectid <= ins->objectid &&
-                   root->current_insert.objectid +
-                   root->current_insert.offset > ins->objectid) ||
-                  (root->current_insert.objectid > ins->objectid &&
-                   root->current_insert.objectid <= ins->objectid +
-                   ins->offset) ||
-                  radix_tree_lookup(&root->pinned_radix, ins->objectid) ||
-                  radix_tree_tag_get(&root->cache_radix, ins->objectid,
-                                     CTREE_EXTENT_PENDING_ADD)) {
-                       search_start = ins->objectid + 1;
+       for (test_block = ins->objectid;
+            test_block < ins->objectid + total_needed; test_block++) {
+               if (test_radix_bit(&root->fs_info->pinned_radix,
+                                     test_block)) {
+                       search_start = test_block + 1;
                        goto check_failed;
                }
        }
-       if (ins->offset != 1)
-               BUG();
+       BUG_ON(root->fs_info->current_insert.offset);
+       root->fs_info->current_insert.offset = total_needed - num_blocks;
+       root->fs_info->current_insert.objectid = ins->objectid + num_blocks;
+       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:
-       release_path(root, &path);
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
        return ret;
 }
 
@@ -367,94 +455,242 @@ error:
  *
  * returns 0 if everything worked, non-zero otherwise.
  */
-int alloc_extent(struct ctree_root *root, u64 num_blocks, u64 search_start,
-                        u64 search_end, u64 owner, struct key *ins,
-                        struct tree_buffer **buf)
+int btrfs_alloc_extent(struct btrfs_trans_handle *trans, 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 extent_item extent_item;
-       extent_item.refs = 1;
-       extent_item.owner = owner;
+       u64 super_blocks_used;
+       struct btrfs_fs_info *info = root->fs_info;
+       struct btrfs_root *extent_root = info->extent_root;
+       struct btrfs_extent_item extent_item;
 
-       ret = find_free_extent(root, num_blocks, search_start, search_end, ins);
-       if (ret)
-               return ret;
-       if (root != root->extent_root) {
-               memcpy(&root->extent_root->current_insert, ins, sizeof(*ins));
-               ret = insert_item(root->extent_root, ins, &extent_item,
-                                 sizeof(extent_item));
-               memset(&root->extent_root->current_insert, 0,
-                      sizeof(struct key));
-               pending_ret = run_pending(root->extent_root);
-               if (ret)
-                       return ret;
-               if (pending_ret)
-                       return pending_ret;
-               *buf = find_tree_block(root, ins->objectid);
-               dirty_tree_block(root, *buf);
+       btrfs_set_extent_refs(&extent_item, 1);
+       btrfs_set_extent_owner(&extent_item, owner);
+
+       if (root == extent_root) {
+               BUG_ON(extent_root->fs_info->current_insert.offset == 0);
+               BUG_ON(num_blocks != 1);
+               BUG_ON(extent_root->fs_info->current_insert.flags ==
+                      extent_root->fs_info->current_insert.offset);
+               ins->offset = 1;
+               ins->objectid = extent_root->fs_info->current_insert.objectid +
+                               extent_root->fs_info->current_insert.flags++;
                return 0;
        }
-       /* we're allocating an extent for the extent tree, don't recurse */
-       BUG_ON(ins->offset != 1);
-       *buf = find_tree_block(root, ins->objectid);
-       BUG_ON(!*buf);
-       radix_tree_tag_set(&root->cache_radix, ins->objectid,
-                          CTREE_EXTENT_PENDING_ADD);
-       (*buf)->count++;
-       dirty_tree_block(root, *buf);
-       return 0;
+       ret = find_free_extent(trans, root, num_blocks, search_start,
+                              search_end, ins);
+       if (ret)
+               return ret;
+
+       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_insert_item(trans, extent_root, ins, &extent_item,
+                               sizeof(extent_item));
 
+       finish_current_insert(trans, extent_root);
+       pending_ret = del_pending_extents(trans, extent_root);
+       if (ret)
+               return ret;
+       if (pending_ret)
+               return pending_ret;
+       return 0;
 }
 
 /*
  * 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 buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
+                                           struct btrfs_root *root)
 {
-       struct key ins;
+       struct btrfs_key ins;
        int ret;
-       struct tree_buffer *buf = NULL;
+       struct buffer_head *buf;
 
-       ret = alloc_extent(root, 1, 0, (unsigned long)-1,
-                          root->node->node.header.parentid,
-                          &ins, &buf);
+       ret = btrfs_alloc_extent(trans, root, 1, 0, (unsigned long)-1,
+               btrfs_header_parentid(btrfs_buffer_header(root->node)), &ins);
        if (ret) {
                BUG();
                return NULL;
        }
-       if (root != root->extent_root)
-               BUG_ON(radix_tree_tag_get(&root->extent_root->cache_radix,
-                                         buf->blocknr,
-                                         CTREE_EXTENT_PENDING_ADD));
+       buf = btrfs_find_create_tree_block(root, ins.objectid);
+       set_buffer_uptodate(buf);
        return buf;
 }
 
-int btrfs_drop_snapshot(struct ctree_root *root, struct tree_buffer *snap)
+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;
-       int level;
-       int refs;
-       u64 blocknr = snap->blocknr;
 
-       level = node_level(snap->node.header.flags);
-       ret = lookup_block_ref(root, snap->blocknr, &refs);
+       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.
+ */
+static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
+                         *root, struct btrfs_path *path, int *level)
+{
+       struct buffer_head *next;
+       struct buffer_head *cur;
+       u64 blocknr;
+       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,
+                              1, &refs);
        BUG_ON(ret);
-       if (refs == 1 && level != 0) {
-               struct node *n = &snap->node;
-               struct tree_buffer *b;
-               int i;
-               for (i = 0; i < n->header.nritems; i++) {
-                       b = read_tree_block(root, n->blockptrs[i]);
-                       /* FIXME, don't recurse here */
-                       ret = btrfs_drop_snapshot(root, b);
+       if (refs > 1)
+               goto out;
+       /*
+        * walk down to the last node level and free all the leaves
+        */
+       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);
-                       tree_block_release(root, b);
+                       break;
+               }
+               blocknr = btrfs_node_blockptr(btrfs_buffer_node(cur),
+                                             path->slots[*level]);
+               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;
                }
+               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;
+               *level = btrfs_header_level(btrfs_buffer_header(next));
+               path->slots[*level] = 0;
        }
-       ret = free_extent(root, blocknr, 1);
+out:
+       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;
        BUG_ON(ret);
        return 0;
 }
 
+/*
+ * helper for dropping snapshots.  This walks back up the tree in the path
+ * to find the first node higher up where we haven't yet gone through
+ * all the slots
+ */
+static int walk_up_tree(struct btrfs_trans_handle *trans, struct btrfs_root
+                       *root, struct btrfs_path *path, int *level)
+{
+       int i;
+       int slot;
+       int ret;
+       for(i = *level; i < BTRFS_MAX_LEVEL - 1 && path->nodes[i]; i++) {
+               slot = path->slots[i];
+               if (slot < btrfs_header_nritems(
+                   btrfs_buffer_header(path->nodes[i])) - 1) {
+                       path->slots[i]++;
+                       *level = i;
+                       return 0;
+               } else {
+                       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;
+               }
+       }
+       return 1;
+}
+
+/*
+ * drop the reference count on the tree rooted at 'snap'.  This traverses
+ * the tree freeing any blocks that have a ref count of zero after being
+ * decremented.
+ */
+int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
+                       *root, struct buffer_head *snap)
+{
+       int ret = 0;
+       int wret;
+       int level;
+       struct btrfs_path *path;
+       int i;
+       int orig_level;
+
+       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;
+       while(1) {
+               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);
+               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]);
+               }
+       }
+       btrfs_free_path(path);
+       return ret;
+}