Btrfs: Allow large data extents in a single file to span into metadata block groups
[safe/jmp/linux-2.6] / fs / btrfs / extent-tree.c
index aca5802..7405bd5 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);
+#define BLOCK_GROUP_DATA EXTENT_WRITEBACK
+#define BLOCK_GROUP_METADATA EXTENT_UPTODATE
+#define BLOCK_GROUP_DIRTY EXTENT_DIRTY
+
 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 find_search_start(struct btrfs_root *root, int data)
+static int cache_block_group(struct btrfs_root *root,
+                            struct btrfs_block_group_cache *block_group)
 {
-       struct btrfs_block_group_cache *cache[8];
-       struct btrfs_fs_info *info = root->fs_info;
-       u64 used;
-       u64 last;
-       int i;
+       struct btrfs_path *path;
        int ret;
+       struct btrfs_key key;
+       struct extent_buffer *leaf;
+       struct extent_map_tree *free_space_cache;
+       int slot;
+       u64 last = 0;
+       u64 hole_size;
+       u64 first_free;
+       int found = 0;
+
+       root = root->fs_info->extent_root;
+       free_space_cache = &root->fs_info->free_space_cache;
 
-       cache[0] = info->block_group_cache;
-       if (!cache[0])
-               goto find_new;
-       used = btrfs_block_group_used(&cache[0]->item);
-       if (used < (cache[0]->key.offset * 3 / 2))
+       if (block_group->cached)
                return 0;
-find_new:
-       last = 0;
+
+       path = btrfs_alloc_path();
+       if (!path)
+               return -ENOMEM;
+
+       path->reada = 2;
+       first_free = block_group->key.objectid;
+       key.objectid = block_group->key.objectid;
+       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]--;
+
        while(1) {
-               ret = radix_tree_gang_lookup_tag(&info->block_group_radix,
-                                                (void **)cache,
-                                                last, ARRAY_SIZE(cache),
-                                                BTRFS_BLOCK_GROUP_DIRTY);
-               if (!ret)
+               leaf = path->nodes[0];
+               slot = path->slots[0];
+               if (slot >= btrfs_header_nritems(leaf)) {
+                       ret = btrfs_next_leaf(root, path);
+                       if (ret < 0)
+                               goto err;
+                       if (ret == 0) {
+                               continue;
+                       } else {
+                               break;
+                       }
+               }
+
+               btrfs_item_key_to_cpu(leaf, &key, slot);
+               if (key.objectid < block_group->key.objectid) {
+                       if (key.objectid + key.offset > first_free)
+                               first_free = key.objectid + key.offset;
+                       goto next;
+               }
+
+               if (key.objectid >= block_group->key.objectid +
+                   block_group->key.offset) {
                        break;
-               for (i = 0; i < ret; i++) {
-                       used = btrfs_block_group_used(&cache[i]->item);
-                       if (used < (cache[i]->key.offset * 3 / 2)) {
-                               info->block_group_cache = cache[i];
-                               cache[i]->last_alloc = cache[i]->first_free;
-                               return 0;
+               }
+
+               if (btrfs_key_type(&key) == BTRFS_EXTENT_ITEM_KEY) {
+                       if (!found) {
+                               last = first_free;
+                               found = 1;
+                       }
+                       if (key.objectid > last) {
+                               hole_size = key.objectid - last;
+                               set_extent_dirty(free_space_cache, last,
+                                                last + hole_size - 1,
+                                                GFP_NOFS);
                        }
-                       last = cache[i]->key.objectid +
-                               cache[i]->key.offset - 1;
+                       last = key.objectid + key.offset;
                }
+next:
+               path->slots[0]++;
+       }
+
+       if (!found)
+               last = first_free;
+       if (block_group->key.objectid +
+           block_group->key.offset > last) {
+               hole_size = block_group->key.objectid +
+                       block_group->key.offset - last;
+               set_extent_dirty(free_space_cache, last,
+                                last + hole_size - 1, GFP_NOFS);
+       }
+       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 bytenr)
+{
+       struct extent_map_tree *block_group_cache;
+       struct btrfs_block_group_cache *block_group = NULL;
+       u64 ptr;
+       u64 start;
+       u64 end;
+       int ret;
+
+       block_group_cache = &info->block_group_cache;
+       ret = find_first_extent_bit(block_group_cache,
+                                   bytenr, &start, &end,
+                                   BLOCK_GROUP_DATA | BLOCK_GROUP_METADATA);
+       if (ret) {
+               return NULL;
        }
-       last = 0;
+       ret = get_state_private(block_group_cache, start, &ptr);
+       if (ret)
+               return NULL;
+
+       block_group = (struct btrfs_block_group_cache *)(unsigned long)ptr;
+
+
+       if (block_group->key.objectid <= bytenr && bytenr <=
+           block_group->key.objectid + block_group->key.offset)
+               return block_group;
+
+       return NULL;
+}
+
+static u64 find_search_start(struct btrfs_root *root,
+                            struct btrfs_block_group_cache **cache_ret,
+                            u64 search_start, int num, int data)
+{
+       int ret;
+       struct btrfs_block_group_cache *cache = *cache_ret;
+       u64 last;
+       u64 start = 0;
+       u64 end = 0;
+       u64 cache_miss = 0;
+       int wrapped = 0;
+
+again:
+       ret = cache_block_group(root, cache);
+       if (ret)
+               goto out;
+
+       last = max(search_start, cache->key.objectid);
+
        while(1) {
-               ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                                (void **)cache,
-                                                last, ARRAY_SIZE(cache));
-               if (!ret)
-                       break;
-               for (i = 0; i < ret; i++) {
-                       used = btrfs_block_group_used(&cache[i]->item);
-                       if (used < (cache[i]->key.offset * 3 / 2)) {
-                               info->block_group_cache = cache[i];
-                               cache[i]->last_alloc = cache[i]->first_free;
-                               return 0;
+               ret = find_first_extent_bit(&root->fs_info->free_space_cache,
+                                           last, &start, &end, EXTENT_DIRTY);
+               if (ret) {
+                       if (!cache_miss)
+                               cache_miss = last;
+                       goto new_group;
+               }
+
+               start = max(last, start);
+               last = end + 1;
+               if (last - start < num) {
+                       if (last == cache->key.objectid + cache->key.offset)
+                               cache_miss = start;
+                       continue;
+               }
+               if (data != BTRFS_BLOCK_GROUP_MIXED &&
+                   start + num >= cache->key.objectid + cache->key.offset)
+                       goto new_group;
+               return start;
+       }
+out:
+       return search_start;
+
+new_group:
+       last = cache->key.objectid + cache->key.offset;
+wrapped:
+       cache = btrfs_lookup_block_group(root->fs_info, last);
+       if (!cache) {
+               if (!wrapped) {
+                       wrapped = 1;
+                       last = search_start;
+                       data = BTRFS_BLOCK_GROUP_MIXED;
+                       goto wrapped;
+               }
+               return search_start;
+       }
+       if (cache_miss && !cache->cached) {
+               cache_block_group(root, cache);
+               last = cache_miss;
+
+               cache = btrfs_lookup_block_group(root->fs_info, last);
+       }
+       cache = btrfs_find_block_group(root, cache, last, data, 0);
+       *cache_ret = cache;
+       cache_miss = 0;
+       goto again;
+}
+
+static u64 div_factor(u64 num, int factor)
+{
+       if (factor == 10)
+               return num;
+       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, u64 search_start,
+                                                int data, int owner)
+{
+       struct btrfs_block_group_cache *cache;
+       struct extent_map_tree *block_group_cache;
+       struct btrfs_block_group_cache *found_group = NULL;
+       struct btrfs_fs_info *info = root->fs_info;
+       u64 used;
+       u64 last = 0;
+       u64 hint_last;
+       u64 start;
+       u64 end;
+       u64 free_check;
+       u64 ptr;
+       int bit;
+       int ret;
+       int full_search = 0;
+       int factor = 8;
+       int data_swap = 0;
+
+       block_group_cache = &info->block_group_cache;
+
+       if (!owner)
+               factor = 8;
+
+       if (data == BTRFS_BLOCK_GROUP_MIXED) {
+               bit = BLOCK_GROUP_DATA | BLOCK_GROUP_METADATA;
+               factor = 10;
+       } else if (data)
+               bit = BLOCK_GROUP_DATA;
+       else
+               bit = BLOCK_GROUP_METADATA;
+
+       if (search_start) {
+               struct btrfs_block_group_cache *shint;
+               shint = btrfs_lookup_block_group(info, search_start);
+               if (shint && (shint->data == data ||
+                             shint->data == BTRFS_BLOCK_GROUP_MIXED)) {
+                       used = btrfs_block_group_used(&shint->item);
+                       if (used < div_factor(shint->key.offset, factor)) {
+                               return shint;
                        }
-                       last = cache[i]->key.objectid +
-                               cache[i]->key.offset - 1;
                }
        }
-       info->block_group_cache = NULL;
-       return 0;
+       if (hint && (hint->data == data ||
+                    hint->data == BTRFS_BLOCK_GROUP_MIXED)) {
+               used = btrfs_block_group_used(&hint->item);
+               if (used < div_factor(hint->key.offset, factor)) {
+                       return hint;
+               }
+               last = hint->key.objectid + hint->key.offset;
+               hint_last = last;
+       } else {
+               if (hint)
+                       hint_last = max(hint->key.objectid, search_start);
+               else
+                       hint_last = search_start;
+
+               last = hint_last;
+       }
+again:
+       while(1) {
+               ret = find_first_extent_bit(block_group_cache, last,
+                                           &start, &end, bit);
+               if (ret)
+                       break;
+
+               ret = get_state_private(block_group_cache, start, &ptr);
+               if (ret)
+                       break;
+
+               cache = (struct btrfs_block_group_cache *)(unsigned long)ptr;
+               last = cache->key.objectid + cache->key.offset;
+               used = btrfs_block_group_used(&cache->item);
+
+               if (full_search)
+                       free_check = cache->key.offset;
+               else
+                       free_check = div_factor(cache->key.offset, factor);
+
+               if (used < free_check) {
+                       found_group = cache;
+                       goto found;
+               }
+               cond_resched();
+       }
+       if (!full_search) {
+               last = search_start;
+               full_search = 1;
+               goto again;
+       }
+       if (!data_swap) {
+               data_swap = 1;
+               bit = BLOCK_GROUP_DATA | BLOCK_GROUP_METADATA;
+               last = search_start;
+               goto again;
+       }
+found:
+       return found_group;
 }
 
 int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root,
-                               u64 blocknr, u64 num_blocks)
+                               u64 bytenr, u64 num_bytes)
 {
        struct btrfs_path *path;
        int ret;
        struct btrfs_key key;
-       struct btrfs_leaf *l;
+       struct extent_buffer *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);
+       WARN_ON(num_bytes < root->sectorsize);
        path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       key.objectid = blocknr;
-       key.flags = 0;
+       if (!path)
+               return -ENOMEM;
+
+       key.objectid = bytenr;
        btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
-       key.offset = num_blocks;
+       key.offset = num_bytes;
        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);
-       l = btrfs_buffer_leaf(path->nodes[0]);
+       l = 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);
+       refs = btrfs_extent_refs(l, item);
+       btrfs_set_extent_refs(l, item, refs + 1);
        btrfs_mark_buffer_dirty(path->nodes[0]);
 
        btrfs_release_path(root->fs_info->extent_root, path);
@@ -110,30 +379,42 @@ printk("can't find block %Lu %Lu\n", blocknr, num_blocks);
        return 0;
 }
 
+int btrfs_extent_post_op(struct btrfs_trans_handle *trans,
+                        struct btrfs_root *root)
+{
+       finish_current_insert(trans, root->fs_info->extent_root);
+       del_pending_extents(trans, root->fs_info->extent_root);
+       return 0;
+}
+
 static int lookup_extent_ref(struct btrfs_trans_handle *trans,
-                            struct btrfs_root *root, u64 blocknr,
-                            u64 num_blocks, u32 *refs)
+                            struct btrfs_root *root, u64 bytenr,
+                            u64 num_bytes, u32 *refs)
 {
        struct btrfs_path *path;
        int ret;
        struct btrfs_key key;
-       struct btrfs_leaf *l;
+       struct extent_buffer *l;
        struct btrfs_extent_item *item;
 
+       WARN_ON(num_bytes < root->sectorsize);
        path = btrfs_alloc_path();
-       btrfs_init_path(path);
-       key.objectid = blocknr;
-       key.offset = num_blocks;
-       key.flags = 0;
+       key.objectid = bytenr;
+       key.offset = num_bytes;
        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)
+       if (ret < 0)
+               goto out;
+       if (ret != 0) {
+               btrfs_print_leaf(root, path->nodes[0]);
+               printk("failed to find block number %Lu\n", bytenr);
                BUG();
-       l = btrfs_buffer_leaf(path->nodes[0]);
+       }
+       l = 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);
+       *refs = btrfs_extent_refs(l, item);
+out:
        btrfs_free_path(path);
        return 0;
 }
@@ -141,47 +422,87 @@ static int lookup_extent_ref(struct btrfs_trans_handle *trans,
 int btrfs_inc_root_ref(struct btrfs_trans_handle *trans,
                       struct btrfs_root *root)
 {
-       return btrfs_inc_extent_ref(trans, root, bh_blocknr(root->node), 1);
+       return btrfs_inc_extent_ref(trans, root, root->node->start,
+                                   root->node->len);
 }
 
 int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-                 struct buffer_head *buf)
+                 struct extent_buffer *buf)
 {
-       u64 blocknr;
-       struct btrfs_node *buf_node;
-       struct btrfs_leaf *buf_leaf;
-       struct btrfs_disk_key *key;
+       u64 bytenr;
+       u32 nritems;
+       struct btrfs_key key;
        struct btrfs_file_extent_item *fi;
        int i;
-       int leaf;
+       int level;
        int ret;
+       int faili;
+       int err;
 
        if (!root->ref_cows)
                return 0;
-       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)
+
+       level = btrfs_header_level(buf);
+       nritems = btrfs_header_nritems(buf);
+       for (i = 0; i < nritems; i++) {
+               if (level == 0) {
+                       u64 disk_bytenr;
+                       btrfs_item_key_to_cpu(buf, &key, i);
+                       if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
                                continue;
-                       fi = btrfs_item_ptr(buf_leaf, i,
+                       fi = btrfs_item_ptr(buf, i,
                                            struct btrfs_file_extent_item);
-                       if (btrfs_file_extent_type(fi) ==
+                       if (btrfs_file_extent_type(buf, fi) ==
                            BTRFS_FILE_EXTENT_INLINE)
                                continue;
-                       ret = btrfs_inc_extent_ref(trans, root,
-                                   btrfs_file_extent_disk_blocknr(fi),
-                                   btrfs_file_extent_disk_num_blocks(fi));
-                       BUG_ON(ret);
+                       disk_bytenr = btrfs_file_extent_disk_bytenr(buf, fi);
+                       if (disk_bytenr == 0)
+                               continue;
+                       ret = btrfs_inc_extent_ref(trans, root, disk_bytenr,
+                                   btrfs_file_extent_disk_num_bytes(buf, fi));
+                       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);
+                       bytenr = btrfs_node_blockptr(buf, i);
+                       ret = btrfs_inc_extent_ref(trans, root, bytenr,
+                                          btrfs_level_size(root, level - 1));
+                       if (ret) {
+                               faili = i;
+                               goto fail;
+                       }
                }
        }
        return 0;
+fail:
+       WARN_ON(1);
+       for (i =0; i < faili; i++) {
+               if (level == 0) {
+                       u64 disk_bytenr;
+                       btrfs_item_key_to_cpu(buf, &key, i);
+                       if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
+                               continue;
+                       fi = btrfs_item_ptr(buf, i,
+                                           struct btrfs_file_extent_item);
+                       if (btrfs_file_extent_type(buf, fi) ==
+                           BTRFS_FILE_EXTENT_INLINE)
+                               continue;
+                       disk_bytenr = btrfs_file_extent_disk_bytenr(buf, fi);
+                       if (disk_bytenr == 0)
+                               continue;
+                       err = btrfs_free_extent(trans, root, disk_bytenr,
+                                   btrfs_file_extent_disk_num_bytes(buf,
+                                                                     fi), 0);
+                       BUG_ON(err);
+               } else {
+                       bytenr = btrfs_node_blockptr(buf, i);
+                       err = btrfs_free_extent(trans, root, bytenr,
+                                       btrfs_level_size(root, level - 1), 0);
+                       BUG_ON(err);
+               }
+       }
+       return ret;
 }
 
 static int write_one_cache_group(struct btrfs_trans_handle *trans,
@@ -192,18 +513,20 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
        int ret;
        int pending_ret;
        struct btrfs_root *extent_root = root->fs_info->extent_root;
-       struct btrfs_block_group_item *bi;
-       struct btrfs_key ins;
+       unsigned long bi;
+       struct extent_buffer *leaf;
 
-       find_free_extent(trans, extent_root, 0, 0, (u64)-1, &ins);
        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_release_path(extent_root, path);
 
+       leaf = path->nodes[0];
+       bi = btrfs_item_ptr_offset(leaf, path->slots[0]);
+       write_extent_buffer(leaf, &cache->item, bi, sizeof(cache->item));
+       btrfs_mark_buffer_dirty(leaf);
+       btrfs_release_path(extent_root, path);
+fail:
        finish_current_insert(trans, extent_root);
        pending_ret = del_pending_extents(trans, extent_root);
        if (ret)
@@ -215,35 +538,49 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
 }
 
 int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
-                                   struct btrfs_root *root)
+                                  struct btrfs_root *root)
 {
-       struct btrfs_block_group_cache *cache[8];
+       struct extent_map_tree *block_group_cache;
+       struct btrfs_block_group_cache *cache;
        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;
+       u64 last = 0;
+       u64 start;
+       u64 end;
+       u64 ptr;
 
+       block_group_cache = &root->fs_info->block_group_cache;
        path = btrfs_alloc_path();
        if (!path)
                return -ENOMEM;
 
        while(1) {
-               ret = radix_tree_gang_lookup_tag(radix, (void **)cache,
-                                                0, ARRAY_SIZE(cache),
-                                                BTRFS_BLOCK_GROUP_DIRTY);
-               if (!ret)
+               ret = find_first_extent_bit(block_group_cache, last,
+                                           &start, &end, BLOCK_GROUP_DIRTY);
+               if (ret)
+                       break;
+
+               last = end + 1;
+               ret = get_state_private(block_group_cache, start, &ptr);
+               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)
-                               werr = err;
+
+               cache = (struct btrfs_block_group_cache *)(unsigned long)ptr;
+               err = write_one_cache_group(trans, root,
+                                           path, cache);
+               /*
+                * 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;
+                       continue;
                }
+               clear_extent_bits(block_group_cache, start, end,
+                                 BLOCK_GROUP_DIRTY, GFP_NOFS);
        }
        btrfs_free_path(path);
        return werr;
@@ -251,69 +588,124 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
 
 static int update_block_group(struct btrfs_trans_handle *trans,
                              struct btrfs_root *root,
-                             u64 blocknr, u64 num, int alloc)
+                             u64 bytenr, u64 num_bytes, 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 total = num_bytes;
        u64 old_val;
-       u64 block_in_group;
-       int ret;
+       u64 byte_in_group;
+       u64 start;
+       u64 end;
+
        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, bytenr);
+               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,
-                                  BTRFS_BLOCK_GROUP_DIRTY);
+               byte_in_group = bytenr - cache->key.objectid;
+               WARN_ON(byte_in_group > cache->key.offset);
+               start = cache->key.objectid;
+               end = start + cache->key.offset - 1;
+               set_extent_bits(&info->block_group_cache, start, end,
+                               BLOCK_GROUP_DIRTY, GFP_NOFS);
 
                old_val = btrfs_block_group_used(&cache->item);
-               num = min(total, cache->key.offset - block_in_group);
-               total -= num;
-               blocknr += num;
+               num_bytes = min(total, cache->key.offset - byte_in_group);
                if (alloc) {
-                       old_val += num;
-                       if (blocknr > cache->last_alloc)
-                               cache->last_alloc = blocknr;
+                       if (cache->data != data &&
+                           old_val < (cache->key.offset >> 1)) {
+                               int bit_to_clear;
+                               int bit_to_set;
+                               cache->data = data;
+                               if (data) {
+                                       bit_to_clear = BLOCK_GROUP_METADATA;
+                                       bit_to_set = BLOCK_GROUP_DATA;
+                                       cache->item.flags &=
+                                               ~BTRFS_BLOCK_GROUP_MIXED;
+                                       cache->item.flags |=
+                                               BTRFS_BLOCK_GROUP_DATA;
+                               } else {
+                                       bit_to_clear = BLOCK_GROUP_DATA;
+                                       bit_to_set = BLOCK_GROUP_METADATA;
+                                       cache->item.flags &=
+                                               ~BTRFS_BLOCK_GROUP_MIXED;
+                                       cache->item.flags &=
+                                               ~BTRFS_BLOCK_GROUP_DATA;
+                               }
+                               clear_extent_bits(&info->block_group_cache,
+                                                 start, end, bit_to_clear,
+                                                 GFP_NOFS);
+                               set_extent_bits(&info->block_group_cache,
+                                               start, end, bit_to_set,
+                                               GFP_NOFS);
+                       } else if (cache->data != data &&
+                                  cache->data != BTRFS_BLOCK_GROUP_MIXED) {
+                               cache->data = BTRFS_BLOCK_GROUP_MIXED;
+                               set_extent_bits(&info->block_group_cache,
+                                               start, end,
+                                               BLOCK_GROUP_DATA |
+                                               BLOCK_GROUP_METADATA,
+                                               GFP_NOFS);
+                       }
+                       old_val += num_bytes;
                } else {
-                       old_val -= num;
-                       if (blocknr < cache->first_free)
-                               cache->first_free = blocknr;
+                       old_val -= num_bytes;
+                       if (mark_free) {
+                               set_extent_dirty(&info->free_space_cache,
+                                                bytenr, bytenr + num_bytes - 1,
+                                                GFP_NOFS);
+                       }
                }
                btrfs_set_block_group_used(&cache->item, old_val);
+               total -= num_bytes;
+               bytenr += num_bytes;
        }
        return 0;
 }
 
-int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
-                              btrfs_root *root)
+int btrfs_copy_pinned(struct btrfs_root *root, struct extent_map_tree *copy)
 {
-       unsigned long gang[8];
-       u64 first = 0;
+       u64 last = 0;
+       u64 start;
+       u64 end;
+       struct extent_map_tree *pinned_extents = &root->fs_info->pinned_extents;
        int ret;
-       int i;
-       struct radix_tree_root *pinned_radix = &root->fs_info->pinned_radix;
 
        while(1) {
-               ret = find_first_radix_bit(pinned_radix, gang,
-                                          ARRAY_SIZE(gang));
-               if (!ret)
+               ret = find_first_extent_bit(pinned_extents, last,
+                                           &start, &end, EXTENT_DIRTY);
+               if (ret)
                        break;
-               if (!first)
-                       first = gang[0];
-               for (i = 0; i < ret; i++) {
-                       clear_radix_bit(pinned_radix, gang[i]);
-               }
+               set_extent_dirty(copy, start, end, GFP_NOFS);
+               last = end + 1;
        }
-       if (root->fs_info->block_group_cache) {
-               root->fs_info->block_group_cache->last_alloc =
-                       root->fs_info->block_group_cache->first_free;
+       return 0;
+}
+
+int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
+                              struct btrfs_root *root,
+                              struct extent_map_tree *unpin)
+{
+       u64 start;
+       u64 end;
+       int ret;
+       struct extent_map_tree *pinned_extents = &root->fs_info->pinned_extents;
+       struct extent_map_tree *free_space_cache;
+
+       free_space_cache = &root->fs_info->free_space_cache;
+
+       while(1) {
+               ret = find_first_extent_bit(unpin, 0, &start, &end,
+                                           EXTENT_DIRTY);
+               if (ret)
+                       break;
+
+               clear_extent_dirty(pinned_extents, start, end,
+                                  GFP_NOFS);
+               clear_extent_dirty(unpin, start, end, GFP_NOFS);
+               set_extent_dirty(free_space_cache, start, end, GFP_NOFS);
        }
        return 0;
 }
@@ -323,57 +715,60 @@ static int finish_current_insert(struct btrfs_trans_handle *trans, struct
 {
        struct btrfs_key ins;
        struct btrfs_extent_item extent_item;
-       int i;
        int ret;
-       u64 super_blocks_used;
+       int err = 0;
+       u64 start;
+       u64 end;
        struct btrfs_fs_info *info = extent_root->fs_info;
 
-       btrfs_set_extent_refs(&extent_item, 1);
-       ins.offset = 1;
-       ins.flags = 0;
+       btrfs_set_stack_extent_refs(&extent_item, 1);
        btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY);
-       btrfs_set_extent_owner(&extent_item, extent_root->root_key.objectid);
-
-       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 + 1);
-               ret = btrfs_insert_item(trans, extent_root, &ins, &extent_item,
-                                       sizeof(extent_item));
-               BUG_ON(ret);
+       btrfs_set_stack_extent_owner(&extent_item,
+                                    extent_root->root_key.objectid);
+
+       while(1) {
+               ret = find_first_extent_bit(&info->extent_ins, 0, &start,
+                                           &end, EXTENT_LOCKED);
+               if (ret)
+                       break;
+
+               ins.objectid = start;
+               ins.offset = end + 1 - start;
+               err = btrfs_insert_item(trans, extent_root, &ins,
+                                       &extent_item, sizeof(extent_item));
+               clear_extent_bits(&info->extent_ins, start, end, EXTENT_LOCKED,
+                                 GFP_NOFS);
        }
-       extent_root->fs_info->extent_tree_insert_nr = 0;
-       extent_root->fs_info->extent_tree_prealloc_nr = 0;
        return 0;
 }
 
-static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
+static int pin_down_bytes(struct btrfs_root *root, u64 bytenr, u32 num_bytes,
+                         int pending)
 {
-       int err;
-       struct btrfs_header *header;
-       struct buffer_head *bh;
+       int err = 0;
+       struct extent_buffer *buf;
 
        if (!pending) {
-               bh = btrfs_find_tree_block(root, blocknr);
-               if (bh) {
-                       if (buffer_uptodate(bh)) {
+               buf = btrfs_find_tree_block(root, bytenr, num_bytes);
+               if (buf) {
+                       if (btrfs_buffer_uptodate(buf)) {
                                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;
+                               if (btrfs_header_generation(buf) == transid) {
+                                       free_extent_buffer(buf);
+                                       return 1;
                                }
                        }
-                       btrfs_block_release(root, bh);
+                       free_extent_buffer(buf);
                }
-               err = set_radix_bit(&root->fs_info->pinned_radix, blocknr);
+               set_extent_dirty(&root->fs_info->pinned_extents,
+                                bytenr, bytenr + num_bytes - 1, GFP_NOFS);
        } else {
-               err = set_radix_bit(&root->fs_info->pending_del_radix, blocknr);
+               set_extent_bits(&root->fs_info->pending_del,
+                               bytenr, bytenr + num_bytes - 1,
+                               EXTENT_LOCKED, GFP_NOFS);
        }
-       BUG_ON(err);
+       BUG_ON(err < 0);
        return 0;
 }
 
@@ -381,58 +776,69 @@ 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 bytenr, u64 num_bytes, int pin,
+                        int mark_free)
 {
        struct btrfs_path *path;
        struct btrfs_key key;
        struct btrfs_fs_info *info = root->fs_info;
        struct btrfs_root *extent_root = info->extent_root;
+       struct extent_buffer *leaf;
        int ret;
        struct btrfs_extent_item *ei;
-       struct btrfs_key ins;
        u32 refs;
 
-       key.objectid = blocknr;
-       key.flags = 0;
+       key.objectid = bytenr;
        btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
-       key.offset = num_blocks;
+       key.offset = num_bytes;
 
-       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);
-       if (ret) {
-               printk("failed to find %Lu\n", key.objectid);
-               btrfs_print_tree(extent_root, extent_root->node);
-               printk("failed to find %Lu\n", key.objectid);
-               BUG();
-       }
-       ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
+       if (ret < 0)
+               return ret;
+       BUG_ON(ret);
+
+       leaf = path->nodes[0];
+       ei = btrfs_item_ptr(leaf, path->slots[0],
                            struct btrfs_extent_item);
-       BUG_ON(ei->refs == 0);
-       refs = btrfs_extent_refs(ei) - 1;
-       btrfs_set_extent_refs(ei, refs);
-       btrfs_mark_buffer_dirty(path->nodes[0]);
+       refs = btrfs_extent_refs(leaf, ei);
+       BUG_ON(refs == 0);
+       refs -= 1;
+       btrfs_set_extent_refs(leaf, ei, refs);
+       btrfs_mark_buffer_dirty(leaf);
+
        if (refs == 0) {
-               u64 super_blocks_used;
+               u64 super_used;
+               u64 root_used;
 
                if (pin) {
-                       ret = pin_down_block(root, blocknr, 0);
-                       BUG_ON(ret);
+                       ret = pin_down_bytes(root, bytenr, num_bytes, 0);
+                       if (ret > 0)
+                               mark_free = 1;
+                       BUG_ON(ret < 0);
                }
 
-               super_blocks_used = btrfs_super_blocks_used(info->disk_super);
-               btrfs_set_super_blocks_used(info->disk_super,
-                                           super_blocks_used - num_blocks);
+               /* block accounting for super block */
+               super_used = btrfs_super_bytes_used(&info->super_copy);
+               btrfs_set_super_bytes_used(&info->super_copy,
+                                          super_used - num_bytes);
+
+               /* block accounting for root item */
+               root_used = btrfs_root_used(&root->root_item);
+               btrfs_set_root_used(&root->root_item,
+                                          root_used - num_bytes);
+
                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, bytenr, num_bytes, 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;
@@ -446,31 +852,28 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
                               btrfs_root *extent_root)
 {
        int ret;
-       int wret;
        int err = 0;
-       unsigned long gang[4];
-       int i;
-       struct radix_tree_root *pending_radix;
-       struct radix_tree_root *pinned_radix;
+       u64 start;
+       u64 end;
+       struct extent_map_tree *pending_del;
+       struct extent_map_tree *pinned_extents;
 
-       pending_radix = &extent_root->fs_info->pending_del_radix;
-       pinned_radix = &extent_root->fs_info->pinned_radix;
+       pending_del = &extent_root->fs_info->pending_del;
+       pinned_extents = &extent_root->fs_info->pinned_extents;
 
        while(1) {
-               ret = find_first_radix_bit(pending_radix, gang,
-                                          ARRAY_SIZE(gang));
-               if (!ret)
+               ret = find_first_extent_bit(pending_del, 0, &start, &end,
+                                           EXTENT_LOCKED);
+               if (ret)
                        break;
-               for (i = 0; i < ret; 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;
-               }
+
+               set_extent_dirty(pinned_extents, start, end, GFP_NOFS);
+               clear_extent_bits(pending_del, start, end, EXTENT_LOCKED,
+                                 GFP_NOFS);
+               ret = __free_extent(trans, extent_root,
+                                    start, end + 1 - start, 0, 0);
+               if (ret)
+                       err = ret;
        }
        return err;
 }
@@ -479,17 +882,18 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
  * remove an extent from the root, returns 0 on success
  */
 int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
-                     *root, u64 blocknr, u64 num_blocks, int pin)
+                     *root, u64 bytenr, u64 num_bytes, int pin)
 {
        struct btrfs_root *extent_root = root->fs_info->extent_root;
        int pending_ret;
        int ret;
 
+       WARN_ON(num_bytes < root->sectorsize);
        if (root == extent_root) {
-               pin_down_block(root, blocknr, 1);
+               pin_down_bytes(root, bytenr, num_bytes, 1);
                return 0;
        }
-       ret = __free_extent(trans, root, blocknr, num_blocks, pin);
+       ret = __free_extent(trans, root, bytenr, num_bytes, pin, pin == 0);
        pending_ret = del_pending_extents(trans, root->fs_info->extent_root);
        return ret ? ret : pending_ret;
 }
@@ -503,157 +907,217 @@ 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_bytes, u64 empty_size,
+                           u64 search_start, u64 search_end, u64 hint_byte,
+                           struct btrfs_key *ins, u64 exclude_start,
+                           u64 exclude_nr, int data)
 {
        struct btrfs_path *path;
        struct btrfs_key key;
        int ret;
        u64 hole_size = 0;
        int slot = 0;
-       u64 last_block = 0;
-       u64 test_block;
+       u64 last_byte = 0;
+       u64 orig_search_start = search_start;
        int start_found;
-       struct btrfs_leaf *l;
+       struct extent_buffer *l;
        struct btrfs_root * root = orig_root->fs_info->extent_root;
        struct btrfs_fs_info *info = root->fs_info;
-       int total_needed = num_blocks;
-       int total_found = 0;
-       int fill_prealloc = 0;
+       u64 total_needed = num_bytes;
        int level;
+       struct btrfs_block_group_cache *block_group;
+       int full_scan = 0;
+       int wrapped = 0;
+       u64 cached_start;
 
-       path = btrfs_alloc_path();
-       ins->flags = 0;
+       WARN_ON(num_bytes < root->sectorsize);
        btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
 
-       level = btrfs_header_level(btrfs_buffer_header(root->node));
-       if (num_blocks == 0) {
-               fill_prealloc = 1;
-               num_blocks = 1;
-               total_needed = min(level + 2, BTRFS_MAX_LEVEL) * 3;
+       level = btrfs_header_level(root->node);
+
+       if (num_bytes >= 96 * 1024 * 1024 && hint_byte) {
+               data = BTRFS_BLOCK_GROUP_MIXED;
        }
-       find_search_start(root, 0);
-       if (info->block_group_cache &&
-           info->block_group_cache->last_alloc > search_start)
-               search_start = info->block_group_cache->last_alloc;
+
+       if (search_end == (u64)-1)
+               search_end = btrfs_super_total_bytes(&info->super_copy);
+       if (hint_byte) {
+               block_group = btrfs_lookup_block_group(info, hint_byte);
+               block_group = btrfs_find_block_group(root, block_group,
+                                                    hint_byte, 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:
+       search_start = find_search_start(root, &block_group,
+                                        search_start, total_needed, data);
+       cached_start = search_start;
+
        btrfs_init_path(path);
        ins->objectid = search_start;
        ins->offset = 0;
        start_found = 0;
+       path->reada = 2;
+
        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 = path->nodes[0];
+       btrfs_item_key_to_cpu(l, &key, path->slots[0]);
+
+       /*
+        * 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]);
+               l = path->nodes[0];
                slot = path->slots[0];
-               if (slot >= btrfs_header_nritems(&l->header)) {
-                       if (fill_prealloc) {
-                               info->extent_tree_prealloc_nr = 0;
-                               total_found = 0;
-                       }
+               if (slot >= btrfs_header_nritems(l)) {
                        ret = btrfs_next_leaf(root, path);
                        if (ret == 0)
                                continue;
                        if (ret < 0)
                                goto error;
+
+                       search_start = max(search_start,
+                                          block_group->key.objectid);
                        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->objectid = last_byte > search_start ?
+                                       last_byte : search_start;
+                       ins->offset = search_end - ins->objectid;
+                       BUG_ON(ins->objectid >= search_end);
                        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;
-                               }
+               btrfs_item_key_to_cpu(l, &key, slot);
+
+               if (key.objectid >= search_start && key.objectid > last_byte &&
+                   start_found) {
+                       if (last_byte < search_start)
+                               last_byte = search_start;
+                       hole_size = key.objectid - last_byte;
+                       if (hole_size >= num_bytes) {
+                               ins->objectid = last_byte;
+                               ins->offset = hole_size;
+                               goto check_pending;
+                       }
+               }
+               if (btrfs_key_type(&key) != BTRFS_EXTENT_ITEM_KEY) {
+                       if (!start_found) {
+                               last_byte = key.objectid;
+                               start_found = 1;
                        }
+                       goto next;
                }
+
+
                start_found = 1;
-               last_block = key.objectid + key.offset;
+               last_byte = key.objectid + key.offset;
+
+               if (!full_scan && data != BTRFS_BLOCK_GROUP_MIXED &&
+                   last_byte >= block_group->key.objectid +
+                   block_group->key.offset) {
+                       btrfs_release_path(root, path);
+                       search_start = block_group->key.objectid +
+                               block_group->key.offset;
+                       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);
-       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;
-               }
-       }
-       if (!fill_prealloc && info->extent_tree_insert_nr) {
-               u64 last =
-                 info->extent_tree_insert[info->extent_tree_insert_nr - 1];
-               if (ins->objectid + num_blocks >
-                   info->extent_tree_insert[0] &&
-                   ins->objectid <= last) {
-                       search_start = last + 1;
-                       WARN_ON(1);
-                       goto check_failed;
-               }
+
+       if (ins->objectid + num_bytes >= search_end)
+               goto enospc;
+
+       if (!full_scan && data != BTRFS_BLOCK_GROUP_MIXED &&
+           ins->objectid + num_bytes >= block_group->
+           key.objectid + block_group->key.offset) {
+               search_start = block_group->key.objectid +
+                       block_group->key.offset;
+               goto new_group;
        }
-       if (!fill_prealloc && info->extent_tree_prealloc_nr) {
-               u64 first =
-                 info->extent_tree_prealloc[info->extent_tree_prealloc_nr - 1];
-               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;
-               }
+       if (test_range_bit(&info->extent_ins, ins->objectid,
+                          ins->objectid + num_bytes -1, EXTENT_LOCKED, 0)) {
+               search_start = ins->objectid + num_bytes;
+               goto new_group;
        }
-       if (fill_prealloc) {
-               int nr;
-               test_block = ins->objectid;
-               while(test_block < ins->objectid + ins->offset &&
-                     total_found < total_needed) {
-                       nr = total_needed - total_found - 1;
-                       BUG_ON(nr < 0);
-                       info->extent_tree_prealloc[nr] = test_block;
-                       total_found++;
-                       test_block++;
-               }
-               if (total_found < total_needed) {
-                       search_start = test_block;
-                       goto check_failed;
-               }
-               info->extent_tree_prealloc_nr = total_found;
+       if (test_range_bit(&info->pinned_extents, ins->objectid,
+                          ins->objectid + num_bytes -1, EXTENT_DIRTY, 0)) {
+               search_start = ins->objectid + num_bytes;
+               goto new_group;
        }
-       ret = radix_tree_gang_lookup(&info->block_group_radix,
-                                    (void **)&info->block_group_cache,
-                                    ins->objectid, 1);
-       if (ret) {
-               info->block_group_cache->last_alloc = ins->objectid;
+       if (exclude_nr > 0 && (ins->objectid + num_bytes > exclude_start &&
+           ins->objectid < exclude_start + exclude_nr)) {
+               search_start = exclude_start + exclude_nr;
+               goto new_group;
+       }
+       if (!data) {
+               block_group = btrfs_lookup_block_group(info, ins->objectid);
+               if (block_group)
+                       trans->block_group = block_group;
        }
-       ins->offset = num_blocks;
+       ins->offset = num_bytes;
        btrfs_free_path(path);
        return 0;
+
+new_group:
+       if (search_start + num_bytes >= search_end) {
+enospc:
+               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);
@@ -668,60 +1132,73 @@ 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_bytes, u64 empty_size, u64 hint_byte,
+                      u64 search_end, struct btrfs_key *ins, int data)
 {
        int ret;
        int pending_ret;
-       u64 super_blocks_used;
+       u64 super_used, root_used;
+       u64 search_start = 0;
        struct btrfs_fs_info *info = root->fs_info;
        struct btrfs_root *extent_root = info->extent_root;
        struct btrfs_extent_item extent_item;
-       struct btrfs_key prealloc_key;
 
-       btrfs_set_extent_refs(&extent_item, 1);
-       btrfs_set_extent_owner(&extent_item, owner);
+       btrfs_set_stack_extent_refs(&extent_item, 1);
+       btrfs_set_stack_extent_owner(&extent_item, owner);
 
-       if (root == extent_root) {
-               int nr;
-               BUG_ON(info->extent_tree_prealloc_nr == 0);
-               BUG_ON(num_blocks != 1);
-               ins->offset = 1;
-               info->extent_tree_prealloc_nr--;
-               nr = info->extent_tree_prealloc_nr;
-               ins->objectid = info->extent_tree_prealloc[nr];
-               info->extent_tree_insert[info->extent_tree_insert_nr++] =
-                       ins->objectid;
-               ret = update_block_group(trans, root,
-                                        ins->objectid, ins->offset, 1);
-               BUG_ON(ret);
-               return 0;
-       }
-       /* do the real allocation */
-       ret = find_free_extent(trans, root, num_blocks, search_start,
-                              search_end, ins);
+       WARN_ON(num_bytes < root->sectorsize);
+       ret = find_free_extent(trans, root, num_bytes, empty_size,
+                              search_start, search_end, hint_byte, ins,
+                              trans->alloc_exclude_start,
+                              trans->alloc_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;
+       /* block accounting for super block */
+       super_used = btrfs_super_bytes_used(&info->super_copy);
+       btrfs_set_super_bytes_used(&info->super_copy, super_used + num_bytes);
+
+       /* block accounting for root item */
+       root_used = btrfs_root_used(&root->root_item);
+       btrfs_set_root_used(&root->root_item, root_used + num_bytes);
+
+       clear_extent_dirty(&root->fs_info->free_space_cache,
+                          ins->objectid, ins->objectid + ins->offset - 1,
+                          GFP_NOFS);
+
+       if (root == extent_root) {
+               set_extent_bits(&root->fs_info->extent_ins, ins->objectid,
+                               ins->objectid + ins->offset - 1,
+                               EXTENT_LOCKED, GFP_NOFS);
+               WARN_ON(data == 1);
+               goto update_block;
+       }
 
-       super_blocks_used = btrfs_super_blocks_used(info->disk_super);
-       btrfs_set_super_blocks_used(info->disk_super, super_blocks_used +
-                                   num_blocks);
+       WARN_ON(trans->alloc_exclude_nr);
+       trans->alloc_exclude_start = ins->objectid;
+       trans->alloc_exclude_nr = ins->offset;
        ret = btrfs_insert_item(trans, extent_root, ins, &extent_item,
                                sizeof(extent_item));
 
+       trans->alloc_exclude_start = 0;
+       trans->alloc_exclude_nr = 0;
+
+       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);
+       }
+
+update_block:
+       ret = update_block_group(trans, root, ins->objectid, ins->offset, 1, 0,
+                                data);
+       BUG_ON(ret);
        return 0;
 }
 
@@ -729,58 +1206,103 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
  * helper function to allocate a block for a given tree
  * returns the tree buffer or NULL.
  */
-struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
-                                          struct btrfs_root *root)
+struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
+                                            struct btrfs_root *root,
+                                            u32 blocksize, u64 hint,
+                                            u64 empty_size)
 {
        struct btrfs_key ins;
        int ret;
-       struct buffer_head *buf;
+       struct extent_buffer *buf;
 
        ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
-                                1, 0, (unsigned long)-1, &ins);
+                                blocksize, empty_size, hint,
+                                (u64)-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);
-       set_buffer_uptodate(buf);
+       buf = btrfs_find_create_tree_block(root, ins.objectid, blocksize);
+       if (!buf) {
+               btrfs_free_extent(trans, root, ins.objectid, blocksize, 0);
+               return ERR_PTR(-ENOMEM);
+       }
+       btrfs_set_buffer_uptodate(buf);
+       set_extent_dirty(&trans->transaction->dirty_pages, buf->start,
+                        buf->start + buf->len - 1, GFP_NOFS);
+       set_extent_bits(&BTRFS_I(root->fs_info->btree_inode)->extent_tree,
+                       buf->start, buf->start + buf->len - 1,
+                       EXTENT_CSUM, GFP_NOFS);
+       buf->flags |= EXTENT_CSUM;
+       btrfs_set_buffer_defrag(buf);
+       trans->blocks_used++;
        return buf;
 }
 
 static int drop_leaf_ref(struct btrfs_trans_handle *trans,
-                        struct btrfs_root *root, struct buffer_head *cur)
+                        struct btrfs_root *root, struct extent_buffer *leaf)
 {
-       struct btrfs_disk_key *key;
-       struct btrfs_leaf *leaf;
+       struct btrfs_key key;
        struct btrfs_file_extent_item *fi;
        int i;
        int nritems;
        int ret;
 
-       BUG_ON(!btrfs_is_leaf(btrfs_buffer_node(cur)));
-       leaf = btrfs_buffer_leaf(cur);
-       nritems = btrfs_header_nritems(&leaf->header);
+       BUG_ON(!btrfs_is_leaf(leaf));
+       nritems = btrfs_header_nritems(leaf);
        for (i = 0; i < nritems; i++) {
-               key = &leaf->items[i].key;
-               if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
+               u64 disk_bytenr;
+
+               btrfs_item_key_to_cpu(leaf, &key, i);
+               if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
                        continue;
                fi = btrfs_item_ptr(leaf, i, struct btrfs_file_extent_item);
-               if (btrfs_file_extent_type(fi) == BTRFS_FILE_EXTENT_INLINE)
+               if (btrfs_file_extent_type(leaf, fi) ==
+                   BTRFS_FILE_EXTENT_INLINE)
                        continue;
                /*
                 * 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);
+               disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);
+               if (disk_bytenr == 0)
+                       continue;
+               ret = btrfs_free_extent(trans, root, disk_bytenr,
+                               btrfs_file_extent_disk_num_bytes(leaf, fi), 0);
                BUG_ON(ret);
        }
        return 0;
 }
 
+static void reada_walk_down(struct btrfs_root *root,
+                           struct extent_buffer *node)
+{
+       int i;
+       u32 nritems;
+       u64 bytenr;
+       int ret;
+       u32 refs;
+       int level;
+       u32 blocksize;
+
+       nritems = btrfs_header_nritems(node);
+       level = btrfs_header_level(node);
+       for (i = 0; i < nritems; i++) {
+               bytenr = btrfs_node_blockptr(node, i);
+               blocksize = btrfs_level_size(root, level - 1);
+               ret = lookup_extent_ref(NULL, root, bytenr, blocksize, &refs);
+               BUG_ON(ret);
+               if (refs != 1)
+                       continue;
+               mutex_unlock(&root->fs_info->fs_mutex);
+               ret = readahead_tree_block(root, bytenr, blocksize);
+               cond_resched();
+               mutex_lock(&root->fs_info->fs_mutex);
+               if (ret)
+                       break;
+       }
+}
+
 /*
  * helper function for drop_snapshot, this walks down the tree dropping ref
  * counts as it goes.
@@ -788,19 +1310,22 @@ static int drop_leaf_ref(struct btrfs_trans_handle *trans,
 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;
+       struct extent_buffer *next;
+       struct extent_buffer *cur;
+       u64 bytenr;
+       u32 blocksize;
        int ret;
        u32 refs;
 
        WARN_ON(*level < 0);
        WARN_ON(*level >= BTRFS_MAX_LEVEL);
-       ret = lookup_extent_ref(trans, root, bh_blocknr(path->nodes[*level]),
-                              1, &refs);
+       ret = lookup_extent_ref(trans, root,
+                               path->nodes[*level]->start,
+                               path->nodes[*level]->len, &refs);
        BUG_ON(ret);
        if (refs > 1)
                goto out;
+
        /*
         * walk down to the last node level and free all the leaves
         */
@@ -808,40 +1333,65 @@ 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 (btrfs_header_level(btrfs_buffer_header(cur)) != *level)
+
+               if (*level > 0 && path->slots[*level] == 0)
+                       reada_walk_down(root, cur);
+
+               if (btrfs_header_level(cur) != *level)
                        WARN_ON(1);
+
                if (path->slots[*level] >=
-                   btrfs_header_nritems(btrfs_buffer_header(cur)))
+                   btrfs_header_nritems(cur))
                        break;
                if (*level == 0) {
                        ret = drop_leaf_ref(trans, root, cur);
                        BUG_ON(ret);
                        break;
                }
-               blocknr = btrfs_node_blockptr(btrfs_buffer_node(cur),
-                                             path->slots[*level]);
-               ret = lookup_extent_ref(trans, root, blocknr, 1, &refs);
+               bytenr = btrfs_node_blockptr(cur, path->slots[*level]);
+               blocksize = btrfs_level_size(root, *level - 1);
+               ret = lookup_extent_ref(trans, root, bytenr, blocksize, &refs);
                BUG_ON(ret);
                if (refs != 1) {
                        path->slots[*level]++;
-                       ret = btrfs_free_extent(trans, root, blocknr, 1, 1);
+                       ret = btrfs_free_extent(trans, root, bytenr,
+                                               blocksize, 1);
                        BUG_ON(ret);
                        continue;
                }
-               next = read_tree_block(root, blocknr);
+               next = btrfs_find_tree_block(root, bytenr, blocksize);
+               if (!next || !btrfs_buffer_uptodate(next)) {
+                       free_extent_buffer(next);
+                       mutex_unlock(&root->fs_info->fs_mutex);
+                       next = read_tree_block(root, bytenr, blocksize);
+                       mutex_lock(&root->fs_info->fs_mutex);
+
+                       /* we dropped the lock, check one more time */
+                       ret = lookup_extent_ref(trans, root, bytenr,
+                                               blocksize, &refs);
+                       BUG_ON(ret);
+                       if (refs != 1) {
+                               path->slots[*level]++;
+                               free_extent_buffer(next);
+                               ret = btrfs_free_extent(trans, root,
+                                                       bytenr, blocksize, 1);
+                               BUG_ON(ret);
+                               continue;
+                       }
+               }
                WARN_ON(*level <= 0);
                if (path->nodes[*level-1])
-                       btrfs_block_release(root, path->nodes[*level-1]);
+                       free_extent_buffer(path->nodes[*level-1]);
                path->nodes[*level-1] = next;
-               *level = btrfs_header_level(btrfs_buffer_header(next));
+               *level = btrfs_header_level(next);
                path->slots[*level] = 0;
        }
 out:
        WARN_ON(*level < 0);
        WARN_ON(*level >= BTRFS_MAX_LEVEL);
-       ret = btrfs_free_extent(trans, root,
-                               bh_blocknr(path->nodes[*level]), 1, 1);
-       btrfs_block_release(root, path->nodes[*level]);
+       ret = btrfs_free_extent(trans, root, path->nodes[*level]->start,
+                               path->nodes[*level]->len, 1);
+       free_extent_buffer(path->nodes[*level]);
        path->nodes[*level] = NULL;
        *level += 1;
        BUG_ON(ret);
@@ -859,19 +1409,28 @@ 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) {
+               if (slot < btrfs_header_nritems(path->nodes[i]) - 1) {
+                       struct extent_buffer *node;
+                       struct btrfs_disk_key disk_key;
+                       node = path->nodes[i];
                        path->slots[i]++;
                        *level = i;
+                       WARN_ON(*level == 0);
+                       btrfs_node_key(node, &disk_key, path->slots[i]);
+                       memcpy(&root_item->drop_progress,
+                              &disk_key, sizeof(disk_key));
+                       root_item->drop_level = i;
                        return 0;
                } else {
                        ret = btrfs_free_extent(trans, root,
-                                               bh_blocknr(path->nodes[*level]),
-                                               1, 1);
+                                               path->nodes[*level]->start,
+                                               path->nodes[*level]->len, 1);
                        BUG_ON(ret);
-                       btrfs_block_release(root, path->nodes[*level]);
+                       free_extent_buffer(path->nodes[*level]);
                        path->nodes[*level] = NULL;
                        *level = i + 1;
                }
@@ -885,7 +1444,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;
@@ -893,15 +1452,35 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
        struct btrfs_path *path;
        int i;
        int orig_level;
+       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(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;
+               extent_buffer_get(root->node);
+               path->slots[level] = 0;
+       } else {
+               struct btrfs_key key;
+               struct btrfs_disk_key found_key;
+               struct extent_buffer *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 = path->nodes[level];
+               btrfs_node_key(node, &found_key, path->slots[level]);
+               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)
@@ -914,34 +1493,44 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
                        break;
                if (wret < 0)
                        ret = wret;
+               ret = -EAGAIN;
+               break;
        }
        for (i = 0; i <= orig_level; i++) {
                if (path->nodes[i]) {
-                       btrfs_block_release(root, path->nodes[i]);
+                       free_extent_buffer(path->nodes[i]);
+                       path->nodes[i] = NULL;
                }
        }
+out:
        btrfs_free_path(path);
        return ret;
 }
 
 int btrfs_free_block_groups(struct btrfs_fs_info *info)
 {
+       u64 start;
+       u64 end;
+       u64 ptr;
        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,
-                                            ARRAY_SIZE(cache));
+               ret = find_first_extent_bit(&info->block_group_cache, 0,
+                                           &start, &end, (unsigned int)-1);
+               if (ret)
+                       break;
+               ret = get_state_private(&info->block_group_cache, start, &ptr);
                if (!ret)
+                       kfree((void *)(unsigned long)ptr);
+               clear_extent_bits(&info->block_group_cache, start,
+                                 end, (unsigned int)-1, GFP_NOFS);
+       }
+       while(1) {
+               ret = find_first_extent_bit(&info->free_space_cache, 0,
+                                           &start, &end, EXTENT_DIRTY);
+               if (ret)
                        break;
-               for (i = 0; i < ret; i++) {
-                       radix_tree_delete(&info->block_group_radix,
-                                         cache[i]->key.objectid +
-                                         cache[i]->key.offset - 1);
-                       kfree(cache[i]);
-               }
+               clear_extent_dirty(&info->free_space_cache, start,
+                                  end, GFP_NOFS);
        }
        return 0;
 }
@@ -951,17 +1540,19 @@ int btrfs_read_block_groups(struct btrfs_root *root)
        struct btrfs_path *path;
        int ret;
        int err = 0;
-       struct btrfs_block_group_item *bi;
+       int bit;
        struct btrfs_block_group_cache *cache;
+       struct btrfs_fs_info *info = root->fs_info;
+       struct extent_map_tree *block_group_cache;
        struct btrfs_key key;
        struct btrfs_key found_key;
-       struct btrfs_leaf *leaf;
-       u64 group_size_blocks = BTRFS_BLOCK_GROUP_SIZE / root->blocksize;
+       struct extent_buffer *leaf;
 
-       root = root->fs_info->extent_root;
+       block_group_cache = &info->block_group_cache;
+
+       root = info->extent_root;
        key.objectid = 0;
-       key.offset = group_size_blocks;
-       key.flags = 0;
+       key.offset = BTRFS_BLOCK_GROUP_SIZE;
        btrfs_set_key_type(&key, BTRFS_BLOCK_GROUP_ITEM_KEY);
 
        path = btrfs_alloc_path();
@@ -969,35 +1560,49 @@ 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;
                        break;
                }
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               btrfs_disk_key_to_cpu(&found_key,
-                                     &leaf->items[path->slots[0]].key);
+               leaf = path->nodes[0];
+               btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
                cache = kmalloc(sizeof(*cache), GFP_NOFS);
                if (!cache) {
                        err = -1;
                        break;
                }
-               bi = btrfs_item_ptr(leaf, path->slots[0],
-                                   struct btrfs_block_group_item);
-               memcpy(&cache->item, bi, sizeof(*bi));
+
+               read_extent_buffer(leaf, &cache->item,
+                                  btrfs_item_ptr_offset(leaf, path->slots[0]),
+                                  sizeof(cache->item));
                memcpy(&cache->key, &found_key, sizeof(found_key));
-               cache->last_alloc = 0;
-               cache->first_free = 0;
+               cache->cached = 0;
+
                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 +
-                                       found_key.offset - 1,
-                                       (void *)cache);
-               BUG_ON(ret);
+
+               if (cache->item.flags & BTRFS_BLOCK_GROUP_MIXED) {
+                       bit = BLOCK_GROUP_DATA | BLOCK_GROUP_METADATA;
+                       cache->data = BTRFS_BLOCK_GROUP_MIXED;
+               } else if (cache->item.flags & BTRFS_BLOCK_GROUP_DATA) {
+                       bit = BLOCK_GROUP_DATA;
+                       cache->data = BTRFS_BLOCK_GROUP_DATA;
+               } else {
+                       bit = BLOCK_GROUP_METADATA;
+                       cache->data = 0;
+               }
+
+               /* use EXTENT_LOCKED to prevent merging */
+               set_extent_bits(block_group_cache, found_key.objectid,
+                               found_key.objectid + found_key.offset - 1,
+                               bit | EXTENT_LOCKED, GFP_NOFS);
+               set_state_private(block_group_cache, found_key.objectid,
+                                 (unsigned long)cache);
+
                if (key.objectid >=
-                   btrfs_super_total_blocks(root->fs_info->disk_super))
+                   btrfs_super_total_bytes(&info->super_copy))
                        break;
        }