Btrfs: Let some locks go during defrag and snapshot dropping
[linux-block.git] / fs / btrfs / extent-tree.c
index 2837fddf7b1c49ba3fe395f64c1c83f85774daf8..f7d76d34fc3752a22d26761d4b8f487c8166d6b4 100644 (file)
-#include <linux/module.h>
+/*
+ * Copyright (C) 2007 Oracle.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#include <linux/sched.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "print-tree.h"
 #include "transaction.h"
 
 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);
+                           *orig_root, u64 num_blocks, u64 empty_size,
+                           u64 search_start,
+                           u64 search_end, u64 hint_block,
+                           struct btrfs_key *ins, u64 exclude_start,
+                           u64 exclude_nr, int data);
 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 cache_block_group(struct btrfs_root *root,
+                            struct btrfs_block_group_cache *block_group)
+{
+       struct btrfs_path *path;
+       int ret;
+       struct btrfs_key key;
+       struct btrfs_leaf *leaf;
+       struct radix_tree_root *extent_radix;
+       int slot;
+       u64 i;
+       u64 last = 0;
+       u64 hole_size;
+       u64 limit;
+       int found = 0;
+
+       root = root->fs_info->extent_root;
+       extent_radix = &root->fs_info->extent_map_radix;
+
+       if (block_group->cached)
+               return 0;
+       if (block_group->data)
+               return 0;
+       path = btrfs_alloc_path();
+       if (!path)
+               return -ENOMEM;
+       path->reada = 1;
+       key.objectid = block_group->key.objectid;
+       key.flags = 0;
+       key.offset = 0;
+       btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
+       ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+       if (ret < 0)
+               return ret;
+       if (ret && path->slots[0] > 0)
+               path->slots[0]--;
+       limit = block_group->key.objectid + block_group->key.offset;
+       while(1) {
+               leaf = btrfs_buffer_leaf(path->nodes[0]);
+               slot = path->slots[0];
+               if (slot >= btrfs_header_nritems(&leaf->header)) {
+                       ret = btrfs_next_leaf(root, path);
+                       if (ret < 0)
+                               goto err;
+                       if (ret == 0) {
+                               continue;
+                       } else {
+                               if (found) {
+                                       hole_size = block_group->key.objectid +
+                                               block_group->key.offset - last;
+                               } else {
+                                       last = block_group->key.objectid;
+                                       hole_size = block_group->key.offset;
+                               }
+                               for (i = 0; i < hole_size; i++) {
+                                       set_radix_bit(extent_radix,
+                                                     last + i);
+                               }
+                               break;
+                       }
+               }
+               btrfs_disk_key_to_cpu(&key, &leaf->items[slot].key);
+               if (key.objectid >= block_group->key.objectid +
+                   block_group->key.offset) {
+                       if (found) {
+                               hole_size = block_group->key.objectid +
+                                       block_group->key.offset - last;
+                       } else {
+                               last = block_group->key.objectid;
+                               hole_size = block_group->key.offset;
+                       }
+                       for (i = 0; i < hole_size; i++) {
+                               set_radix_bit(extent_radix, last + i);
+                       }
+                       break;
+               }
+               if (btrfs_key_type(&key) == BTRFS_EXTENT_ITEM_KEY) {
+                       if (!found) {
+                               last = key.objectid + key.offset;
+                               found = 1;
+                       } else {
+                               hole_size = key.objectid - last;
+                               for (i = 0; i < hole_size; i++) {
+                                       set_radix_bit(extent_radix, last + i);
+                               }
+                               last = key.objectid + key.offset;
+                       }
+               }
+               path->slots[0]++;
+       }
+
+       block_group->cached = 1;
+err:
+       btrfs_free_path(path);
+       return 0;
+}
+
+struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
+                                                        btrfs_fs_info *info,
+                                                        u64 blocknr)
+{
+       struct btrfs_block_group_cache *block_group;
+       int ret;
+
+       ret = radix_tree_gang_lookup(&info->block_group_radix,
+                                    (void **)&block_group,
+                                    blocknr, 1);
+       if (ret) {
+               if (block_group->key.objectid <= blocknr && blocknr <=
+                   block_group->key.objectid + block_group->key.offset)
+                       return block_group;
+       }
+       ret = radix_tree_gang_lookup(&info->block_group_data_radix,
+                                    (void **)&block_group,
+                                    blocknr, 1);
+       if (ret) {
+               if (block_group->key.objectid <= blocknr && blocknr <=
+                   block_group->key.objectid + block_group->key.offset)
+                       return block_group;
+       }
+       return NULL;
+}
+
+static u64 leaf_range(struct btrfs_root *root)
+{
+       u64 size = BTRFS_LEAF_DATA_SIZE(root);
+       do_div(size, sizeof(struct btrfs_extent_item) +
+               sizeof(struct btrfs_item));
+       return size;
+}
+
+static u64 find_search_start(struct btrfs_root *root,
+                            struct btrfs_block_group_cache **cache_ret,
+                            u64 search_start, int num)
+{
+       unsigned long gang[8];
+       int ret;
+       struct btrfs_block_group_cache *cache = *cache_ret;
+       u64 last = max(search_start, cache->key.objectid);
+
+       if (cache->data)
+               goto out;
+       if (num > 1) {
+               last = max(last, cache->last_prealloc);
+       }
+again:
+       ret = cache_block_group(root, cache);
+       if (ret)
+               goto out;
+       while(1) {
+               ret = find_first_radix_bit(&root->fs_info->extent_map_radix,
+                                          gang, last, ARRAY_SIZE(gang));
+               if (!ret)
+                       goto out;
+               last = gang[ret-1] + 1;
+               if (num > 1) {
+                       if (ret != ARRAY_SIZE(gang)) {
+                               goto new_group;
+                       }
+                       if (gang[ret-1] - gang[0] > leaf_range(root)) {
+                               continue;
+                       }
+               }
+               if (gang[0] >= cache->key.objectid + cache->key.offset) {
+                       goto new_group;
+               }
+               return gang[0];
+       }
+out:
+       return max(cache->last_alloc, search_start);
+
+new_group:
+       cache = btrfs_lookup_block_group(root->fs_info,
+                                        last + cache->key.offset - 1);
+       if (!cache) {
+               return max((*cache_ret)->last_alloc, search_start);
+       }
+       cache = btrfs_find_block_group(root, cache,
+                                      last + cache->key.offset - 1, 0, 0);
+       *cache_ret = cache;
+       goto again;
+}
+
+static u64 div_factor(u64 num, int factor)
+{
+       num *= factor;
+       do_div(num, 10);
+       return num;
+}
+
 struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root,
                                                 struct btrfs_block_group_cache
-                                                *hint, int data)
+                                                *hint, u64 search_start,
+                                                int data, int owner)
 {
        struct btrfs_block_group_cache *cache[8];
        struct btrfs_block_group_cache *found_group = NULL;
        struct btrfs_fs_info *info = root->fs_info;
+       struct radix_tree_root *radix;
+       struct radix_tree_root *swap_radix;
        u64 used;
        u64 last = 0;
        u64 hint_last;
        int i;
        int ret;
        int full_search = 0;
-       if (hint) {
+       int factor = 8;
+       int data_swap = 0;
+
+       if (!owner)
+               factor = 5;
+
+       if (data) {
+               radix = &info->block_group_data_radix;
+               swap_radix = &info->block_group_radix;
+       } else {
+               radix = &info->block_group_radix;
+               swap_radix = &info->block_group_data_radix;
+       }
+
+       if (search_start) {
+               struct btrfs_block_group_cache *shint;
+               shint = btrfs_lookup_block_group(info, search_start);
+               if (shint->data == data) {
+                       used = btrfs_block_group_used(&shint->item);
+                       if (used + shint->pinned <
+                           div_factor(shint->key.offset, factor)) {
+                               return shint;
+                       }
+               }
+       }
+       if (hint && hint->data == data) {
                used = btrfs_block_group_used(&hint->item);
-               if (used < (hint->key.offset * 2) / 3) {
+               if (used + hint->pinned <
+                   div_factor(hint->key.offset, factor)) {
                        return hint;
                }
-               radix_tree_tag_clear(&info->block_group_radix,
-                                    hint->key.objectid + hint->key.offset - 1,
-                                    BTRFS_BLOCK_GROUP_AVAIL);
-               last = hint->key.objectid + hint->key.offset;
+               if (used >= div_factor(hint->key.offset, 8)) {
+                       radix_tree_tag_clear(radix,
+                                            hint->key.objectid +
+                                            hint->key.offset - 1,
+                                            BTRFS_BLOCK_GROUP_AVAIL);
+               }
+               last = hint->key.offset * 3;
+               if (hint->key.objectid >= last)
+                       last = max(search_start + hint->key.offset - 1,
+                                  hint->key.objectid - last);
+               else
+                       last = hint->key.objectid + hint->key.offset;
                hint_last = last;
        } else {
-               hint_last = 0;
-               last = 0;
+               if (hint)
+                       hint_last = max(hint->key.objectid, search_start);
+               else
+                       hint_last = search_start;
+
+               last = hint_last;
        }
        while(1) {
-               ret = radix_tree_gang_lookup_tag(&info->block_group_radix,
-                                                (void **)cache,
+               ret = radix_tree_gang_lookup_tag(radix, (void **)cache,
                                                 last, ARRAY_SIZE(cache),
                                                 BTRFS_BLOCK_GROUP_AVAIL);
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
+                       last = cache[i]->key.objectid +
+                               cache[i]->key.offset;
                        used = btrfs_block_group_used(&cache[i]->item);
-                       if (used < (cache[i]->key.offset * 2) / 3) {
-                               info->block_group_cache = cache[i];
+                       if (used + cache[i]->pinned <
+                           div_factor(cache[i]->key.offset, factor)) {
                                found_group = cache[i];
                                goto found;
                        }
-                       radix_tree_tag_clear(&info->block_group_radix,
-                                          cache[i]->key.objectid +
-                                          cache[i]->key.offset - 1,
-                                          BTRFS_BLOCK_GROUP_AVAIL);
-                       last = cache[i]->key.objectid +
-                               cache[i]->key.offset;
+                       if (used >= div_factor(cache[i]->key.offset, 8)) {
+                               radix_tree_tag_clear(radix,
+                                                    cache[i]->key.objectid +
+                                                    cache[i]->key.offset - 1,
+                                                    BTRFS_BLOCK_GROUP_AVAIL);
+                       }
                }
+               cond_resched();
        }
        last = hint_last;
 again:
        while(1) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                                (void **)cache,
-                                                last, ARRAY_SIZE(cache));
+               ret = radix_tree_gang_lookup(radix, (void **)cache,
+                                            last, ARRAY_SIZE(cache));
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
+                       last = cache[i]->key.objectid +
+                               cache[i]->key.offset;
                        used = btrfs_block_group_used(&cache[i]->item);
-                       if (used < cache[i]->key.offset) {
-                               info->block_group_cache = cache[i];
+                       if (used + cache[i]->pinned < cache[i]->key.offset) {
                                found_group = cache[i];
                                goto found;
                        }
-                       radix_tree_tag_clear(&info->block_group_radix,
-                                          cache[i]->key.objectid +
-                                          cache[i]->key.offset - 1,
-                                          BTRFS_BLOCK_GROUP_AVAIL);
-                       last = cache[i]->key.objectid +
-                               cache[i]->key.offset;
+                       if (used >= cache[i]->key.offset) {
+                               radix_tree_tag_clear(radix,
+                                                    cache[i]->key.objectid +
+                                                    cache[i]->key.offset - 1,
+                                                    BTRFS_BLOCK_GROUP_AVAIL);
+                       }
                }
+               cond_resched();
        }
-       info->block_group_cache = NULL;
        if (!full_search) {
-               last = 0;
+               last = search_start;
                full_search = 1;
                goto again;
        }
-found:
+       if (!data_swap) {
+               struct radix_tree_root *tmp = radix;
+               data_swap = 1;
+               radix = swap_radix;
+               swap_radix = tmp;
+               last = search_start;
+               goto again;
+       }
        if (!found_group) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
+               ret = radix_tree_gang_lookup(radix,
                                             (void **)&found_group, 0, 1);
+               if (ret == 0) {
+                       ret = radix_tree_gang_lookup(swap_radix,
+                                                    (void **)&found_group,
+                                                    0, 1);
+               }
                BUG_ON(ret != 1);
        }
+found:
        return found_group;
 }
 
@@ -111,19 +377,24 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
        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);
+       if (!path)
+               return -ENOMEM;
+       ret = find_free_extent(trans, root->fs_info->extent_root, 0, 0, 0,
+                              (u64)-1, 0, &ins, 0, 0, 0);
+       if (ret) {
+               btrfs_free_path(path);
+               return ret;
+       }
        key.objectid = blocknr;
        key.flags = 0;
        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)
+               return ret;
        if (ret != 0) {
-printk("can't find block %Lu %Lu\n", blocknr, num_blocks);
                BUG();
        }
        BUG_ON(ret != 0);
@@ -151,19 +422,20 @@ static int lookup_extent_ref(struct btrfs_trans_handle *trans,
        struct btrfs_extent_item *item;
 
        path = btrfs_alloc_path();
-       btrfs_init_path(path);
        key.objectid = blocknr;
        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,
                                0, 0);
+       if (ret < 0)
+               goto out;
        if (ret != 0)
                BUG();
        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);
+out:
        btrfs_free_path(path);
        return 0;
 }
@@ -185,6 +457,8 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        int i;
        int leaf;
        int ret;
+       int faili;
+       int err;
 
        if (!root->ref_cows)
                return 0;
@@ -193,6 +467,7 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        buf_leaf = btrfs_buffer_leaf(buf);
        for (i = 0; i < btrfs_header_nritems(&buf_node->header); i++) {
                if (leaf) {
+                       u64 disk_blocknr;
                        key = &buf_leaf->items[i].key;
                        if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
                                continue;
@@ -201,17 +476,51 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                        if (btrfs_file_extent_type(fi) ==
                            BTRFS_FILE_EXTENT_INLINE)
                                continue;
-                       ret = btrfs_inc_extent_ref(trans, root,
-                                   btrfs_file_extent_disk_blocknr(fi),
+                       disk_blocknr = btrfs_file_extent_disk_blocknr(fi);
+                       if (disk_blocknr == 0)
+                               continue;
+                       ret = btrfs_inc_extent_ref(trans, root, disk_blocknr,
                                    btrfs_file_extent_disk_num_blocks(fi));
-                       BUG_ON(ret);
+                       if (ret) {
+                               faili = i;
+                               goto fail;
+                       }
                } else {
                        blocknr = btrfs_node_blockptr(buf_node, i);
                        ret = btrfs_inc_extent_ref(trans, root, blocknr, 1);
-                       BUG_ON(ret);
+                       if (ret) {
+                               faili = i;
+                               goto fail;
+                       }
                }
        }
        return 0;
+fail:
+       WARN_ON(1);
+       for (i =0; i < faili; i++) {
+               if (leaf) {
+                       u64 disk_blocknr;
+                       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);
+                       if (btrfs_file_extent_type(fi) ==
+                           BTRFS_FILE_EXTENT_INLINE)
+                               continue;
+                       disk_blocknr = btrfs_file_extent_disk_blocknr(fi);
+                       if (disk_blocknr == 0)
+                               continue;
+                       err = btrfs_free_extent(trans, root, disk_blocknr,
+                                   btrfs_file_extent_disk_num_blocks(fi), 0);
+                       BUG_ON(err);
+               } else {
+                       blocknr = btrfs_node_blockptr(buf_node, i);
+                       err = btrfs_free_extent(trans, root, blocknr, 1, 0);
+                       BUG_ON(err);
+               }
+       }
+       return ret;
 }
 
 static int write_one_cache_group(struct btrfs_trans_handle *trans,
@@ -225,35 +534,44 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
        struct btrfs_block_group_item *bi;
        struct btrfs_key ins;
 
-       find_free_extent(trans, extent_root, 0, 0, (u64)-1, &ins);
+       ret = find_free_extent(trans, extent_root, 0, 0, 0, (u64)-1, 0, &ins,
+                              0, 0, 0);
+       /* FIXME, set bit to recalc cache groups on next mount */
+       if (ret)
+               return ret;
        ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
+       if (ret < 0)
+               goto fail;
        BUG_ON(ret);
        bi = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                            struct btrfs_block_group_item);
        memcpy(bi, &cache->item, sizeof(*bi));
-       mark_buffer_dirty(path->nodes[0]);
+       btrfs_mark_buffer_dirty(path->nodes[0]);
        btrfs_release_path(extent_root, path);
-
+fail:
        finish_current_insert(trans, extent_root);
        pending_ret = del_pending_extents(trans, extent_root);
        if (ret)
                return ret;
        if (pending_ret)
                return pending_ret;
+       if (cache->data)
+               cache->last_alloc = cache->first_free;
        return 0;
 
 }
 
-int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
-                                   struct btrfs_root *root)
+static int write_dirty_block_radix(struct btrfs_trans_handle *trans,
+                                  struct btrfs_root *root,
+                                  struct radix_tree_root *radix)
 {
        struct btrfs_block_group_cache *cache[8];
        int ret;
        int err = 0;
        int werr = 0;
-       struct radix_tree_root *radix = &root->fs_info->block_group_radix;
        int i;
        struct btrfs_path *path;
+       unsigned long off = 0;
 
        path = btrfs_alloc_path();
        if (!path)
@@ -261,63 +579,129 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
 
        while(1) {
                ret = radix_tree_gang_lookup_tag(radix, (void **)cache,
-                                                0, ARRAY_SIZE(cache),
+                                                off, ARRAY_SIZE(cache),
                                                 BTRFS_BLOCK_GROUP_DIRTY);
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
-                       radix_tree_tag_clear(radix, cache[i]->key.objectid +
-                                            cache[i]->key.offset - 1,
-                                            BTRFS_BLOCK_GROUP_DIRTY);
                        err = write_one_cache_group(trans, root,
                                                    path, cache[i]);
-                       if (err)
+                       /*
+                        * if we fail to write the cache group, we want
+                        * to keep it marked dirty in hopes that a later
+                        * write will work
+                        */
+                       if (err) {
                                werr = err;
-                       cache[i]->last_alloc = cache[i]->first_free;
+                               off = cache[i]->key.objectid +
+                                       cache[i]->key.offset;
+                               continue;
+                       }
+
+                       radix_tree_tag_clear(radix, cache[i]->key.objectid +
+                                            cache[i]->key.offset - 1,
+                                            BTRFS_BLOCK_GROUP_DIRTY);
                }
        }
        btrfs_free_path(path);
        return werr;
 }
 
+int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
+                                  struct btrfs_root *root)
+{
+       int ret;
+       int ret2;
+       ret = write_dirty_block_radix(trans, root,
+                                     &root->fs_info->block_group_radix);
+       ret2 = write_dirty_block_radix(trans, root,
+                                     &root->fs_info->block_group_data_radix);
+       if (ret)
+               return ret;
+       if (ret2)
+               return ret2;
+       return 0;
+}
+
 static int update_block_group(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root,
-                             u64 blocknr, u64 num, int alloc)
+                             u64 blocknr, u64 num, int alloc, int mark_free,
+                             int data)
 {
        struct btrfs_block_group_cache *cache;
        struct btrfs_fs_info *info = root->fs_info;
        u64 total = num;
        u64 old_val;
        u64 block_in_group;
+       u64 i;
        int ret;
+
        while(total) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                            (void **)&cache, blocknr, 1);
-               if (!ret) {
-                       printk(KERN_CRIT "blocknr %Lu lookup failed\n",
-                              blocknr);
+               cache = btrfs_lookup_block_group(info, blocknr);
+               if (!cache) {
                        return -1;
                }
                block_in_group = blocknr - cache->key.objectid;
                WARN_ON(block_in_group > cache->key.offset);
-               radix_tree_tag_set(&info->block_group_radix,
-                                  cache->key.objectid + cache->key.offset - 1,
+               radix_tree_tag_set(cache->radix, cache->key.objectid +
+                                  cache->key.offset - 1,
                                   BTRFS_BLOCK_GROUP_DIRTY);
 
                old_val = btrfs_block_group_used(&cache->item);
                num = min(total, cache->key.offset - block_in_group);
-               total -= num;
-               blocknr += num;
                if (alloc) {
-                       old_val += num;
                        if (blocknr > cache->last_alloc)
                                cache->last_alloc = blocknr;
+                       if (!cache->data) {
+                               for (i = 0; i < num; i++) {
+                                       clear_radix_bit(&info->extent_map_radix,
+                                                       blocknr + i);
+                               }
+                       }
+                       if (cache->data != data &&
+                           old_val < (cache->key.offset >> 1)) {
+                               cache->data = data;
+                               radix_tree_delete(cache->radix,
+                                                 cache->key.objectid +
+                                                 cache->key.offset - 1);
+
+                               if (data) {
+                                       cache->radix =
+                                               &info->block_group_data_radix;
+                                       cache->item.flags |=
+                                               BTRFS_BLOCK_GROUP_DATA;
+                               } else {
+                                       cache->radix = &info->block_group_radix;
+                                       cache->item.flags &=
+                                               ~BTRFS_BLOCK_GROUP_DATA;
+                               }
+                               ret = radix_tree_insert(cache->radix,
+                                                       cache->key.objectid +
+                                                       cache->key.offset - 1,
+                                                       (void *)cache);
+                       }
+                       old_val += num;
                } else {
                        old_val -= num;
                        if (blocknr < cache->first_free)
                                cache->first_free = blocknr;
+                       if (!cache->data && mark_free) {
+                               for (i = 0; i < num; i++) {
+                                       set_radix_bit(&info->extent_map_radix,
+                                                     blocknr + i);
+                               }
+                       }
+                       if (old_val < (cache->key.offset >> 1) &&
+                           old_val + num >= (cache->key.offset >> 1)) {
+                               radix_tree_tag_set(cache->radix,
+                                                  cache->key.objectid +
+                                                  cache->key.offset - 1,
+                                                  BTRFS_BLOCK_GROUP_AVAIL);
+                       }
                }
                btrfs_set_block_group_used(&cache->item, old_val);
+               total -= num;
+               blocknr += num;
        }
        return 0;
 }
@@ -325,22 +709,47 @@ static int update_block_group(struct btrfs_trans_handle *trans,
 static int try_remove_page(struct address_space *mapping, unsigned long index)
 {
        int ret;
+       return 0;
        ret = invalidate_mapping_pages(mapping, index, index);
        return ret;
 }
 
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
-                              btrfs_root *root)
+int btrfs_copy_pinned(struct btrfs_root *root, struct radix_tree_root *copy)
+{
+       unsigned long gang[8];
+       u64 last = 0;
+       struct radix_tree_root *pinned_radix = &root->fs_info->pinned_radix;
+       int ret;
+       int i;
+
+       while(1) {
+               ret = find_first_radix_bit(pinned_radix, gang, last,
+                                          ARRAY_SIZE(gang));
+               if (!ret)
+                       break;
+               for (i = 0 ; i < ret; i++) {
+                       set_radix_bit(copy, gang[i]);
+                       last = gang[i] + 1;
+               }
+       }
+       return 0;
+}
+
+int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
+                              struct btrfs_root *root,
+                              struct radix_tree_root *unpin_radix)
 {
        unsigned long gang[8];
        struct inode *btree_inode = root->fs_info->btree_inode;
+       struct btrfs_block_group_cache *block_group;
        u64 first = 0;
        int ret;
        int i;
        struct radix_tree_root *pinned_radix = &root->fs_info->pinned_radix;
+       struct radix_tree_root *extent_radix = &root->fs_info->extent_map_radix;
 
        while(1) {
-               ret = find_first_radix_bit(pinned_radix, gang,
+               ret = find_first_radix_bit(unpin_radix, gang, 0,
                                           ARRAY_SIZE(gang));
                if (!ret)
                        break;
@@ -348,6 +757,19 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
                        first = gang[0];
                for (i = 0; i < ret; i++) {
                        clear_radix_bit(pinned_radix, gang[i]);
+                       clear_radix_bit(unpin_radix, gang[i]);
+                       block_group = btrfs_lookup_block_group(root->fs_info,
+                                                              gang[i]);
+                       if (block_group) {
+                               WARN_ON(block_group->pinned == 0);
+                               block_group->pinned--;
+                               if (gang[i] < block_group->last_alloc)
+                                       block_group->last_alloc = gang[i];
+                               if (gang[i] < block_group->last_prealloc)
+                                       block_group->last_prealloc = gang[i];
+                               if (!block_group->data)
+                                       set_radix_bit(extent_radix, gang[i]);
+                       }
                        try_remove_page(btree_inode->i_mapping,
                                        gang[i] << (PAGE_CACHE_SHIFT -
                                                    btree_inode->i_blkbits));
@@ -374,15 +796,14 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct
 
        for (i = 0; i < extent_root->fs_info->extent_tree_insert_nr; i++) {
                ins.objectid = extent_root->fs_info->extent_tree_insert[i];
-               super_blocks_used = btrfs_super_blocks_used(info->disk_super);
-               btrfs_set_super_blocks_used(info->disk_super,
+               super_blocks_used = btrfs_super_blocks_used(&info->super_copy);
+               btrfs_set_super_blocks_used(&info->super_copy,
                                            super_blocks_used + 1);
                ret = btrfs_insert_item(trans, extent_root, &ins, &extent_item,
                                        sizeof(extent_item));
                BUG_ON(ret);
        }
        extent_root->fs_info->extent_tree_insert_nr = 0;
-       extent_root->fs_info->extent_tree_prealloc_nr = 0;
        return 0;
 }
 
@@ -408,10 +829,17 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
                        btrfs_block_release(root, bh);
                }
                err = set_radix_bit(&root->fs_info->pinned_radix, blocknr);
+               if (!err) {
+                       struct btrfs_block_group_cache *cache;
+                       cache = btrfs_lookup_block_group(root->fs_info,
+                                                        blocknr);
+                       if (cache)
+                               cache->pinned++;
+               }
        } else {
                err = set_radix_bit(&root->fs_info->pending_del_radix, blocknr);
        }
-       BUG_ON(err);
+       BUG_ON(err < 0);
        return 0;
 }
 
@@ -419,7 +847,8 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
  * remove an extent from the root, returns 0 on success
  */
 static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
-                        *root, u64 blocknr, u64 num_blocks, int pin)
+                        *root, u64 blocknr, u64 num_blocks, int pin,
+                        int mark_free)
 {
        struct btrfs_path *path;
        struct btrfs_key key;
@@ -435,18 +864,20 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
        btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
        key.offset = num_blocks;
 
-       find_free_extent(trans, root, 0, 0, (u64)-1, &ins);
        path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
+       if (!path)
+               return -ENOMEM;
 
-       ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
+       ret = find_free_extent(trans, root, 0, 0, 0, (u64)-1, 0, &ins, 0, 0, 0);
        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();
+               btrfs_free_path(path);
+               return ret;
        }
+
+       ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
+       if (ret < 0)
+               return ret;
+       BUG_ON(ret);
        ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                            struct btrfs_extent_item);
        BUG_ON(ei->refs == 0);
@@ -461,16 +892,17 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
                        BUG_ON(ret);
                }
 
-               super_blocks_used = btrfs_super_blocks_used(info->disk_super);
-               btrfs_set_super_blocks_used(info->disk_super,
+               super_blocks_used = btrfs_super_blocks_used(&info->super_copy);
+               btrfs_set_super_blocks_used(&info->super_copy,
                                            super_blocks_used - num_blocks);
                ret = btrfs_del_item(trans, extent_root, path);
-               if (ret)
-                       BUG();
-               ret = update_block_group(trans, root, blocknr, num_blocks, 0);
+               if (ret) {
+                       return ret;
+               }
+               ret = update_block_group(trans, root, blocknr, num_blocks, 0,
+                                        mark_free, 0);
                BUG_ON(ret);
        }
-       btrfs_release_path(extent_root, path);
        btrfs_free_path(path);
        finish_current_insert(trans, extent_root);
        return ret;
@@ -490,22 +922,34 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
        int i;
        struct radix_tree_root *pending_radix;
        struct radix_tree_root *pinned_radix;
+       struct btrfs_block_group_cache *cache;
 
        pending_radix = &extent_root->fs_info->pending_del_radix;
        pinned_radix = &extent_root->fs_info->pinned_radix;
 
        while(1) {
-               ret = find_first_radix_bit(pending_radix, gang,
+               ret = find_first_radix_bit(pending_radix, gang, 0,
                                           ARRAY_SIZE(gang));
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
                        wret = set_radix_bit(pinned_radix, gang[i]);
-                       BUG_ON(wret);
+                       if (wret == 0) {
+                               cache =
+                                 btrfs_lookup_block_group(extent_root->fs_info,
+                                                          gang[i]);
+                               if (cache)
+                                       cache->pinned++;
+                       }
+                       if (wret < 0) {
+                               printk(KERN_CRIT "set_radix_bit, err %d\n",
+                                      wret);
+                               BUG_ON(wret < 0);
+                       }
                        wret = clear_radix_bit(pending_radix, gang[i]);
                        BUG_ON(wret);
                        wret = __free_extent(trans, extent_root,
-                                            gang[i], 1, 0);
+                                            gang[i], 1, 0, 0);
                        if (wret)
                                err = wret;
                }
@@ -527,7 +971,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
                pin_down_block(root, blocknr, 1);
                return 0;
        }
-       ret = __free_extent(trans, root, blocknr, num_blocks, pin);
+       ret = __free_extent(trans, root, blocknr, num_blocks, pin, pin == 0);
        pending_ret = del_pending_extents(trans, root->fs_info->extent_root);
        return ret ? ret : pending_ret;
 }
@@ -541,8 +985,10 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
  * Any available blocks before search_start are skipped.
  */
 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)
+                           *orig_root, u64 num_blocks, u64 empty_size,
+                           u64 search_start, u64 search_end, u64 hint_block,
+                           struct btrfs_key *ins, u64 exclude_start,
+                           u64 exclude_nr, int data)
 {
        struct btrfs_path *path;
        struct btrfs_key key;
@@ -551,6 +997,7 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
        int slot = 0;
        u64 last_block = 0;
        u64 test_block;
+       u64 orig_search_start = search_start;
        int start_found;
        struct btrfs_leaf *l;
        struct btrfs_root * root = orig_root->fs_info->extent_root;
@@ -559,54 +1006,86 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
        int total_found = 0;
        int fill_prealloc = 0;
        int level;
-       int update_block_group = 0;
-       struct btrfs_block_group_cache *hint_block_group;
+       struct btrfs_block_group_cache *block_group;
+       int full_scan = 0;
+       int wrapped = 0;
+       u64 limit;
 
-       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));
-       /* find search start here */
-       if (0 && search_start && num_blocks) {
-               u64 used;
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                            (void **)&hint_block_group,
-                                            search_start, 1);
-               if (ret) {
-                       used = btrfs_block_group_used(&hint_block_group->item);
-                       if (used > (hint_block_group->key.offset * 9) / 10)
-                               search_start = 0;
-                       else if (search_start < hint_block_group->last_alloc)
-                               search_start = hint_block_group->last_alloc;
-               } else {
-                       search_start = 0;
-               }
-       }
        if (num_blocks == 0) {
                fill_prealloc = 1;
                num_blocks = 1;
-               total_needed = (min(level + 1, BTRFS_MAX_LEVEL) + 2) * 3;
+               total_needed = (min(level + 1, BTRFS_MAX_LEVEL)) * 6;
+       }
+       if (fill_prealloc) {
+               u64 first;
+               int nr = info->extent_tree_prealloc_nr;
+               first = info->extent_tree_prealloc[nr - 1];
+               if (info->extent_tree_prealloc_nr >= total_needed &&
+                   first >= search_start) {
+                       ins->objectid = info->extent_tree_prealloc[0];
+                       ins->offset = 1;
+                       return 0;
+               }
+               info->extent_tree_prealloc_nr = 0;
        }
-       if (1 || !search_start) {
-               trans->block_group = btrfs_find_block_group(root,
-                                                           trans->block_group,
-                                                           0);
-               if (trans->block_group->last_alloc > search_start)
-                       search_start = trans->block_group->last_alloc;
-               update_block_group = 1;
+       if (search_end == (u64)-1)
+               search_end = btrfs_super_total_blocks(&info->super_copy);
+       if (hint_block) {
+               block_group = btrfs_lookup_block_group(info, hint_block);
+               block_group = btrfs_find_block_group(root, block_group,
+                                                    hint_block, data, 1);
+       } else {
+               block_group = btrfs_find_block_group(root,
+                                                    trans->block_group, 0,
+                                                    data, 1);
        }
+
+       total_needed += empty_size;
+       path = btrfs_alloc_path();
+
 check_failed:
+       if (!block_group->data)
+               search_start = find_search_start(root, &block_group,
+                                                search_start, total_needed);
+       else if (!full_scan)
+               search_start = max(block_group->last_alloc, search_start);
+
        btrfs_init_path(path);
        ins->objectid = search_start;
        ins->offset = 0;
        start_found = 0;
+
        ret = btrfs_search_slot(trans, root, ins, path, 0, 0);
        if (ret < 0)
                goto error;
 
-       if (path->slots[0] > 0)
+       if (path->slots[0] > 0) {
                path->slots[0]--;
+       }
+
+       l = btrfs_buffer_leaf(path->nodes[0]);
+       btrfs_disk_key_to_cpu(&key, &l->items[path->slots[0]].key);
+       /*
+        * a rare case, go back one key if we hit a block group item
+        * instead of an extent item
+        */
+       if (btrfs_key_type(&key) != BTRFS_EXTENT_ITEM_KEY &&
+           key.objectid + key.offset >= search_start) {
+               ins->objectid = key.objectid;
+               ins->offset = key.offset - 1;
+               btrfs_release_path(root, path);
+               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 = btrfs_buffer_leaf(path->nodes[0]);
@@ -616,6 +1095,12 @@ check_failed:
                                info->extent_tree_prealloc_nr = 0;
                                total_found = 0;
                        }
+                       if (start_found)
+                               limit = last_block +
+                                       (block_group->key.offset >> 1);
+                       else
+                               limit = search_start +
+                                       (block_group->key.offset >> 1);
                        ret = btrfs_next_leaf(root, path);
                        if (ret == 0)
                                continue;
@@ -623,53 +1108,71 @@ check_failed:
                                goto error;
                        if (!start_found) {
                                ins->objectid = search_start;
-                               ins->offset = (u64)-1 - search_start;
+                               ins->offset = search_end - search_start;
                                start_found = 1;
                                goto check_pending;
                        }
                        ins->objectid = last_block > search_start ?
                                        last_block : search_start;
-                       ins->offset = (u64)-1 - ins->objectid;
+                       ins->offset = search_end - ins->objectid;
                        goto check_pending;
                }
+
                btrfs_disk_key_to_cpu(&key, &l->items[slot].key);
-               if (btrfs_key_type(&key) != BTRFS_EXTENT_ITEM_KEY)
-                       goto next;
-               if (key.objectid >= search_start) {
-                       if (start_found) {
-                               if (last_block < search_start)
-                                       last_block = search_start;
-                               hole_size = key.objectid - last_block;
-                               if (hole_size >= num_blocks) {
-                                       ins->objectid = last_block;
-                                       ins->offset = hole_size;
-                                       goto check_pending;
-                               }
+               if (key.objectid >= search_start && key.objectid > last_block &&
+                   start_found) {
+                       if (last_block < search_start)
+                               last_block = search_start;
+                       hole_size = key.objectid - last_block;
+                       if (hole_size >= num_blocks) {
+                               ins->objectid = last_block;
+                               ins->offset = hole_size;
+                               goto check_pending;
                        }
                }
+
+               if (btrfs_key_type(&key) != BTRFS_EXTENT_ITEM_KEY)
+                       goto next;
+
                start_found = 1;
                last_block = key.objectid + key.offset;
+               if (!full_scan && last_block >= block_group->key.objectid +
+                   block_group->key.offset) {
+                       btrfs_release_path(root, path);
+                       search_start = block_group->key.objectid +
+                               block_group->key.offset * 2;
+                       goto new_group;
+               }
 next:
                path->slots[0]++;
+               cond_resched();
        }
-       // 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);
        BUG_ON(ins->objectid < search_start);
-       if (ins->objectid >= btrfs_super_total_blocks(info->disk_super)) {
-               if (search_start == 0)
-                       return -ENOSPC;
-               search_start = 0;
-               goto check_failed;
+
+       if (ins->objectid + num_blocks >= search_end) {
+               if (full_scan) {
+                       ret = -ENOSPC;
+                       goto error;
+               }
+               search_start = orig_search_start;
+               if (wrapped) {
+                       if (!full_scan)
+                               total_needed -= empty_size;
+                       full_scan = 1;
+               } else
+                       wrapped = 1;
+               goto new_group;
        }
        for (test_block = ins->objectid;
             test_block < ins->objectid + num_blocks; test_block++) {
                if (test_radix_bit(&info->pinned_radix, test_block)) {
                        search_start = test_block + 1;
-                       goto check_failed;
+                       goto new_group;
                }
        }
        if (!fill_prealloc && info->extent_tree_insert_nr) {
@@ -679,8 +1182,8 @@ check_pending:
                    info->extent_tree_insert[0] &&
                    ins->objectid <= last) {
                        search_start = last + 1;
-                       WARN_ON(1);
-                       goto check_failed;
+                       WARN_ON(!full_scan);
+                       goto new_group;
                }
        }
        if (!fill_prealloc && info->extent_tree_prealloc_nr) {
@@ -689,13 +1192,22 @@ check_pending:
                if (ins->objectid + num_blocks > first &&
                    ins->objectid <= info->extent_tree_prealloc[0]) {
                        search_start = info->extent_tree_prealloc[0] + 1;
-                       WARN_ON(1);
-                       goto check_failed;
+                       goto new_group;
                }
        }
+       if (exclude_nr > 0 && (ins->objectid + num_blocks > exclude_start &&
+           ins->objectid < exclude_start + exclude_nr)) {
+               search_start = exclude_start + exclude_nr;
+               goto new_group;
+       }
        if (fill_prealloc) {
                int nr;
                test_block = ins->objectid;
+               if (test_block - info->extent_tree_prealloc[total_needed - 1] >=
+                   leaf_range(root)) {
+                       total_found = 0;
+                       info->extent_tree_prealloc_nr = total_found;
+               }
                while(test_block < ins->objectid + ins->offset &&
                      total_found < total_needed) {
                        nr = total_needed - total_found - 1;
@@ -706,21 +1218,45 @@ check_pending:
                }
                if (total_found < total_needed) {
                        search_start = test_block;
-                       goto check_failed;
+                       goto new_group;
                }
                info->extent_tree_prealloc_nr = total_found;
        }
-       if (update_block_group) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                            (void **)&trans->block_group,
-                                            ins->objectid, 1);
-               if (ret) {
-                       trans->block_group->last_alloc = ins->objectid;
+       if (!data) {
+               block_group = btrfs_lookup_block_group(info, ins->objectid);
+               if (block_group) {
+                       if (fill_prealloc)
+                               block_group->last_prealloc =
+                                    info->extent_tree_prealloc[total_needed-1];
+                       else
+                               trans->block_group = block_group;
                }
        }
        ins->offset = num_blocks;
        btrfs_free_path(path);
        return 0;
+
+new_group:
+       if (search_start + num_blocks >= search_end) {
+               search_start = orig_search_start;
+               if (full_scan) {
+                       ret = -ENOSPC;
+                       goto error;
+               }
+               if (wrapped) {
+                       if (!full_scan)
+                               total_needed -= empty_size;
+                       full_scan = 1;
+               } else
+                       wrapped = 1;
+       }
+       block_group = btrfs_lookup_block_group(info, search_start);
+       cond_resched();
+       if (!full_scan)
+               block_group = btrfs_find_block_group(root, block_group,
+                                                    search_start, data, 0);
+       goto check_failed;
+
 error:
        btrfs_release_path(root, path);
        btrfs_free_path(path);
@@ -735,12 +1271,15 @@ error:
  */
 int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
                       struct btrfs_root *root, u64 owner,
-                      u64 num_blocks, u64 search_start,
-                      u64 search_end, struct btrfs_key *ins)
+                      u64 num_blocks, u64 empty_size, u64 hint_block,
+                      u64 search_end, struct btrfs_key *ins, int data)
 {
        int ret;
        int pending_ret;
        u64 super_blocks_used;
+       u64 search_start = 0;
+       u64 exclude_start = 0;
+       u64 exclude_nr = 0;
        struct btrfs_fs_info *info = root->fs_info;
        struct btrfs_root *extent_root = info->extent_root;
        struct btrfs_extent_item extent_item;
@@ -760,35 +1299,76 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
                info->extent_tree_insert[info->extent_tree_insert_nr++] =
                        ins->objectid;
                ret = update_block_group(trans, root,
-                                        ins->objectid, ins->offset, 1);
+                                        ins->objectid, ins->offset, 1, 0, 0);
+               WARN_ON(info->extent_tree_insert_nr >
+                       ARRAY_SIZE(info->extent_tree_insert));
                BUG_ON(ret);
                return 0;
        }
+
+       /*
+        * if we're doing a data allocation, preallocate room in the
+        * extent tree first.  This way the extent tree blocks end up
+        * in the correct block group.
+        */
+       if (data) {
+               ret = find_free_extent(trans, root, 0, 0, 0,
+                                      search_end, 0, &prealloc_key, 0, 0, 0);
+               BUG_ON(ret);
+               if (ret)
+                       return ret;
+               exclude_nr = info->extent_tree_prealloc_nr;
+               exclude_start = info->extent_tree_prealloc[exclude_nr - 1];
+       }
+
        /* do the real allocation */
-       ret = find_free_extent(trans, root, num_blocks, search_start,
-                              search_end, ins);
+       ret = find_free_extent(trans, root, num_blocks, empty_size,
+                              search_start, search_end, hint_block, ins,
+                              exclude_start, exclude_nr, data);
+       BUG_ON(ret);
        if (ret)
                return ret;
 
-       /* then do prealloc for the extent tree */
-       ret = find_free_extent(trans, root, 0, ins->objectid + ins->offset,
-                              search_end, &prealloc_key);
-       if (ret)
-               return ret;
+       /*
+        * if we're doing a metadata allocation, preallocate space in the
+        * extent tree second.  This way, we don't create a tiny hole
+        * in the allocation map between any unused preallocation blocks
+        * and the metadata block we're actually allocating.  On disk,
+        * it'll go:
+        * [block we've allocated], [used prealloc 1], [ unused prealloc ]
+        * The unused prealloc will get reused the next time around.
+        */
+       if (!data) {
+               exclude_start = ins->objectid;
+               exclude_nr = ins->offset;
+               hint_block = exclude_start + exclude_nr;
+               ret = find_free_extent(trans, root, 0, 0, search_start,
+                                      search_end, hint_block,
+                                      &prealloc_key, exclude_start,
+                                      exclude_nr, 0);
+               BUG_ON(ret);
+               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 +
+       super_blocks_used = btrfs_super_blocks_used(&info->super_copy);
+       btrfs_set_super_blocks_used(&info->super_copy, super_blocks_used +
                                    num_blocks);
        ret = btrfs_insert_item(trans, extent_root, ins, &extent_item,
                                sizeof(extent_item));
 
+       BUG_ON(ret);
        finish_current_insert(trans, extent_root);
        pending_ret = del_pending_extents(trans, extent_root);
-       if (ret)
+       if (ret) {
                return ret;
-       if (pending_ret)
+       }
+       if (pending_ret) {
                return pending_ret;
-       ret = update_block_group(trans, root, ins->objectid, ins->offset, 1);
+       }
+       ret = update_block_group(trans, root, ins->objectid, ins->offset, 1, 0,
+                                data);
+       BUG_ON(ret);
        return 0;
 }
 
@@ -797,20 +1377,26 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
  * returns the tree buffer or NULL.
  */
 struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
-                                          struct btrfs_root *root, u64 hint)
+                                          struct btrfs_root *root, u64 hint,
+                                          u64 empty_size)
 {
        struct btrfs_key ins;
        int ret;
        struct buffer_head *buf;
 
        ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
-                                1, hint, (unsigned long)-1, &ins);
+                                1, empty_size, hint,
+                                (unsigned long)-1, &ins, 0);
        if (ret) {
-               BUG();
-               return NULL;
+               BUG_ON(ret > 0);
+               return ERR_PTR(ret);
        }
-       BUG_ON(ret);
        buf = btrfs_find_create_tree_block(root, ins.objectid);
+       if (!buf) {
+               btrfs_free_extent(trans, root, ins.objectid, 1, 0);
+               return ERR_PTR(-ENOMEM);
+       }
+       WARN_ON(buffer_dirty(buf));
        set_buffer_uptodate(buf);
        set_buffer_checked(buf);
        set_radix_bit(&trans->transaction->dirty_pages, buf->b_page->index);
@@ -831,6 +1417,7 @@ static int drop_leaf_ref(struct btrfs_trans_handle *trans,
        leaf = btrfs_buffer_leaf(cur);
        nritems = btrfs_header_nritems(&leaf->header);
        for (i = 0; i < nritems; i++) {
+               u64 disk_blocknr;
                key = &leaf->items[i].key;
                if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
                        continue;
@@ -841,8 +1428,10 @@ static int drop_leaf_ref(struct btrfs_trans_handle *trans,
                 * 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),
+               disk_blocknr = btrfs_file_extent_disk_blocknr(fi);
+               if (disk_blocknr == 0)
+                       continue;
+               ret = btrfs_free_extent(trans, root, disk_blocknr,
                                        btrfs_file_extent_disk_num_blocks(fi),
                                        0);
                BUG_ON(ret);
@@ -850,6 +1439,28 @@ static int drop_leaf_ref(struct btrfs_trans_handle *trans,
        return 0;
 }
 
+static void reada_walk_down(struct btrfs_root *root,
+                           struct btrfs_node *node)
+{
+       int i;
+       u32 nritems;
+       u64 blocknr;
+       int ret;
+       u32 refs;
+
+       nritems = btrfs_header_nritems(&node->header);
+       for (i = 0; i < nritems; i++) {
+               blocknr = btrfs_node_blockptr(node, i);
+               ret = lookup_extent_ref(NULL, root, blocknr, 1, &refs);
+               BUG_ON(ret);
+               if (refs != 1)
+                       continue;
+               ret = readahead_tree_block(root, blocknr);
+               if (ret)
+                       break;
+       }
+}
+
 /*
  * helper function for drop_snapshot, this walks down the tree dropping ref
  * counts as it goes.
@@ -870,6 +1481,7 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
        BUG_ON(ret);
        if (refs > 1)
                goto out;
+
        /*
         * walk down to the last node level and free all the leaves
         */
@@ -877,8 +1489,13 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
                WARN_ON(*level < 0);
                WARN_ON(*level >= BTRFS_MAX_LEVEL);
                cur = path->nodes[*level];
+
+               if (*level > 0 && path->slots[*level] == 0)
+                       reada_walk_down(root, btrfs_buffer_node(cur));
+
                if (btrfs_header_level(btrfs_buffer_header(cur)) != *level)
                        WARN_ON(1);
+
                if (path->slots[*level] >=
                    btrfs_header_nritems(btrfs_buffer_header(cur)))
                        break;
@@ -928,12 +1545,21 @@ static int walk_up_tree(struct btrfs_trans_handle *trans, struct btrfs_root
        int i;
        int slot;
        int ret;
+       struct btrfs_root_item *root_item = &root->root_item;
+
        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) {
+                       struct btrfs_node *node;
+                       node = btrfs_buffer_node(path->nodes[i]);
                        path->slots[i]++;
                        *level = i;
+                       WARN_ON(*level == 0);
+                       memcpy(&root_item->drop_progress,
+                              &node->ptrs[path->slots[i]].key,
+                              sizeof(root_item->drop_progress));
+                       root_item->drop_level = i;
                        return 0;
                } else {
                        ret = btrfs_free_extent(trans, root,
@@ -954,7 +1580,7 @@ static int walk_up_tree(struct btrfs_trans_handle *trans, struct btrfs_root
  * decremented.
  */
 int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
-                       *root, struct buffer_head *snap)
+                       *root)
 {
        int ret = 0;
        int wret;
@@ -962,15 +1588,35 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
        struct btrfs_path *path;
        int i;
        int orig_level;
+       int num_walks = 0;
+       struct btrfs_root_item *root_item = &root->root_item;
 
        path = btrfs_alloc_path();
        BUG_ON(!path);
-       btrfs_init_path(path);
 
-       level = btrfs_header_level(btrfs_buffer_header(snap));
+       level = btrfs_header_level(btrfs_buffer_header(root->node));
        orig_level = level;
-       path->nodes[level] = snap;
-       path->slots[level] = 0;
+       if (btrfs_disk_key_objectid(&root_item->drop_progress) == 0) {
+               path->nodes[level] = root->node;
+               path->slots[level] = 0;
+       } else {
+               struct btrfs_key key;
+               struct btrfs_disk_key *found_key;
+               struct btrfs_node *node;
+
+               btrfs_disk_key_to_cpu(&key, &root_item->drop_progress);
+               level = root_item->drop_level;
+               path->lowest_level = level;
+               wret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+               if (wret < 0) {
+                       ret = wret;
+                       goto out;
+               }
+               node = btrfs_buffer_node(path->nodes[level]);
+               found_key = &node->ptrs[path->slots[level]].key;
+               WARN_ON(memcmp(found_key, &root_item->drop_progress,
+                              sizeof(*found_key)));
+       }
        while(1) {
                wret = walk_down_tree(trans, root, path, &level);
                if (wret > 0)
@@ -983,31 +1629,37 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
                        break;
                if (wret < 0)
                        ret = wret;
+               num_walks++;
+               if (num_walks > 2) {
+                       ret = -EAGAIN;
+                       get_bh(root->node);
+                       break;
+               }
        }
        for (i = 0; i <= orig_level; i++) {
                if (path->nodes[i]) {
                        btrfs_block_release(root, path->nodes[i]);
+                       path->nodes[i] = 0;
                }
        }
+out:
        btrfs_free_path(path);
        return ret;
 }
 
-int btrfs_free_block_groups(struct btrfs_fs_info *info)
+static int free_block_group_radix(struct radix_tree_root *radix)
 {
        int ret;
        struct btrfs_block_group_cache *cache[8];
        int i;
 
        while(1) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                            (void **)cache, 0,
+               ret = radix_tree_gang_lookup(radix, (void **)cache, 0,
                                             ARRAY_SIZE(cache));
                if (!ret)
                        break;
                for (i = 0; i < ret; i++) {
-                       radix_tree_delete(&info->block_group_radix,
-                                         cache[i]->key.objectid +
+                       radix_tree_delete(radix, cache[i]->key.objectid +
                                          cache[i]->key.offset - 1);
                        kfree(cache[i]);
                }
@@ -1015,6 +1667,32 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
        return 0;
 }
 
+int btrfs_free_block_groups(struct btrfs_fs_info *info)
+{
+       int ret;
+       int ret2;
+       unsigned long gang[16];
+       int i;
+
+       ret = free_block_group_radix(&info->block_group_radix);
+       ret2 = free_block_group_radix(&info->block_group_data_radix);
+       if (ret)
+               return ret;
+       if (ret2)
+               return ret2;
+
+       while(1) {
+               ret = find_first_radix_bit(&info->extent_map_radix,
+                                          gang, 0, ARRAY_SIZE(gang));
+               if (!ret)
+                       break;
+               for (i = 0; i < ret; i++) {
+                       clear_radix_bit(&info->extent_map_radix, gang[i]);
+               }
+       }
+       return 0;
+}
+
 int btrfs_read_block_groups(struct btrfs_root *root)
 {
        struct btrfs_path *path;
@@ -1022,13 +1700,17 @@ int btrfs_read_block_groups(struct btrfs_root *root)
        int err = 0;
        struct btrfs_block_group_item *bi;
        struct btrfs_block_group_cache *cache;
+       struct btrfs_fs_info *info = root->fs_info;
+       struct radix_tree_root *radix;
        struct btrfs_key key;
        struct btrfs_key found_key;
        struct btrfs_leaf *leaf;
-       u64 group_size_blocks = BTRFS_BLOCK_GROUP_SIZE / root->blocksize;
+       u64 group_size_blocks;
        u64 used;
 
-       root = root->fs_info->extent_root;
+       group_size_blocks = BTRFS_BLOCK_GROUP_SIZE >>
+               root->fs_info->sb->s_blocksize_bits;
+       root = info->extent_root;
        key.objectid = 0;
        key.offset = group_size_blocks;
        key.flags = 0;
@@ -1039,7 +1721,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)
                return -ENOMEM;
 
        while(1) {
-               ret = btrfs_search_slot(NULL, root->fs_info->extent_root,
+               ret = btrfs_search_slot(NULL, info->extent_root,
                                        &key, path, 0, 0);
                if (ret != 0) {
                        err = ret;
@@ -1053,28 +1735,41 @@ int btrfs_read_block_groups(struct btrfs_root *root)
                        err = -1;
                        break;
                }
+
                bi = btrfs_item_ptr(leaf, path->slots[0],
                                    struct btrfs_block_group_item);
+               if (bi->flags & BTRFS_BLOCK_GROUP_DATA) {
+                       radix = &info->block_group_data_radix;
+                       cache->data = 1;
+               } else {
+                       radix = &info->block_group_radix;
+                       cache->data = 0;
+               }
+
                memcpy(&cache->item, bi, sizeof(*bi));
                memcpy(&cache->key, &found_key, sizeof(found_key));
                cache->last_alloc = cache->key.objectid;
                cache->first_free = cache->key.objectid;
+               cache->last_prealloc = cache->key.objectid;
+               cache->pinned = 0;
+               cache->cached = 0;
+
+               cache->radix = radix;
+
                key.objectid = found_key.objectid + found_key.offset;
                btrfs_release_path(root, path);
-               ret = radix_tree_insert(&root->fs_info->block_group_radix,
-                                       found_key.objectid +
+               ret = radix_tree_insert(radix, found_key.objectid +
                                        found_key.offset - 1,
                                        (void *)cache);
                BUG_ON(ret);
                used = btrfs_block_group_used(bi);
-               if (used < (key.offset * 2) / 3) {
-                       radix_tree_tag_set(&root->fs_info->block_group_radix,
-                                          found_key.objectid +
+               if (used < div_factor(key.offset, 8)) {
+                       radix_tree_tag_set(radix, found_key.objectid +
                                           found_key.offset - 1,
                                           BTRFS_BLOCK_GROUP_AVAIL);
                }
                if (key.objectid >=
-                   btrfs_super_total_blocks(root->fs_info->disk_super))
+                   btrfs_super_total_blocks(&info->super_copy))
                        break;
        }