#include "print-tree.h"
#include "transaction.h"
+#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
int ret;
struct btrfs_key key;
struct extent_buffer *leaf;
- struct radix_tree_root *extent_radix;
+ struct extent_map_tree *free_space_cache;
int slot;
- u64 i;
u64 last = 0;
u64 hole_size;
u64 first_free;
int found = 0;
root = root->fs_info->extent_root;
- extent_radix = &root->fs_info->extent_map_radix;
+ free_space_cache = &root->fs_info->free_space_cache;
if (block_group->cached)
return 0;
- if (block_group->data)
- return 0;
+
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
last = first_free;
found = 1;
}
- hole_size = key.objectid - last;
- for (i = 0; i < hole_size; i++) {
- set_radix_bit(extent_radix, last + i);
+ if (key.objectid > last) {
+ hole_size = key.objectid - last;
+ set_extent_dirty(free_space_cache, last,
+ last + hole_size - 1,
+ GFP_NOFS);
}
last = key.objectid + key.offset;
}
block_group->key.offset > last) {
hole_size = block_group->key.objectid +
block_group->key.offset - last;
- for (i = 0; i < hole_size; i++) {
- set_radix_bit(extent_radix, last + i);
- }
+ set_extent_dirty(free_space_cache, last,
+ last + hole_size - 1, GFP_NOFS);
}
block_group->cached = 1;
err:
struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
btrfs_fs_info *info,
- u64 blocknr)
+ u64 bytenr)
{
- struct btrfs_block_group_cache *block_group;
+ struct extent_map_tree *block_group_cache;
+ struct btrfs_block_group_cache *block_group = NULL;
+ u64 ptr;
+ u64 start;
+ u64 end;
int ret;
- ret = radix_tree_gang_lookup(&info->block_group_radix,
- (void **)&block_group,
- blocknr, 1);
+ 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) {
- if (block_group->key.objectid <= blocknr && blocknr <=
- block_group->key.objectid + block_group->key.offset)
- return block_group;
+ return NULL;
}
- 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;
-}
+ ret = get_state_private(block_group_cache, start, &ptr);
+ if (ret)
+ 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;
+ block_group = (struct btrfs_block_group_cache *)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)
+ u64 search_start, int num, int data)
{
- unsigned long gang[8];
int ret;
struct btrfs_block_group_cache *cache = *cache_ret;
- u64 last = max(search_start, cache->key.objectid);
+ u64 last;
+ u64 start = 0;
+ u64 end = 0;
- if (cache->data)
- goto out;
again:
ret = cache_block_group(root, cache);
if (ret)
goto out;
+ last = max(search_start, cache->key.objectid);
+
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) {
+ ret = find_first_extent_bit(&root->fs_info->free_space_cache,
+ last, &start, &end, EXTENT_DIRTY);
+ if (ret) {
goto new_group;
}
- return gang[0];
+
+ start = max(last, start);
+ last = end + 1;
+ if (end + 1 - start < num)
+ continue;
+ if (start + num >= cache->key.objectid + cache->key.offset)
+ goto new_group;
+ return start;
}
out:
- return max(cache->last_alloc, search_start);
+ return search_start;
new_group:
- cache = btrfs_lookup_block_group(root->fs_info,
- last + cache->key.offset - 1);
+ last = cache->key.objectid + cache->key.offset;
+ cache = btrfs_lookup_block_group(root->fs_info, last);
if (!cache) {
- return max((*cache_ret)->last_alloc, search_start);
+ return search_start;
}
- cache = btrfs_find_block_group(root, cache,
- last + cache->key.offset - 1, 0, 0);
+ cache = btrfs_find_block_group(root, cache, last, data, 0);
*cache_ret = cache;
goto again;
}
*hint, u64 search_start,
int data, int owner)
{
- struct btrfs_block_group_cache *cache[8];
+ 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;
- struct radix_tree_root *radix;
- struct radix_tree_root *swap_radix;
u64 used;
u64 last = 0;
u64 hint_last;
- int i;
+ 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 = 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 (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) {
used = btrfs_block_group_used(&shint->item);
- if (used + shint->pinned <
- div_factor(shint->key.offset, factor)) {
+ if (used < div_factor(shint->key.offset, factor)) {
return shint;
}
}
}
if (hint && hint->data == data) {
used = btrfs_block_group_used(&hint->item);
- if (used + hint->pinned <
- div_factor(hint->key.offset, factor)) {
+ if (used < div_factor(hint->key.offset, factor)) {
return hint;
}
- 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;
+ last = hint->key.objectid + hint->key.offset;
hint_last = last;
} else {
if (hint)
last = hint_last;
}
- while(1) {
- 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]->pinned <
- div_factor(cache[i]->key.offset, factor)) {
- found_group = cache[i];
- goto found;
- }
- 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(radix, (void **)cache,
- last, ARRAY_SIZE(cache));
- if (!ret)
+ ret = find_first_extent_bit(block_group_cache, last,
+ &start, &end, bit);
+ 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]->pinned < cache[i]->key.offset) {
- found_group = cache[i];
- goto found;
- }
- if (used >= cache[i]->key.offset) {
- radix_tree_tag_clear(radix,
- cache[i]->key.objectid +
- cache[i]->key.offset - 1,
- BTRFS_BLOCK_GROUP_AVAIL);
- }
+
+ ret = get_state_private(block_group_cache, start, &ptr);
+ if (ret)
+ break;
+
+ cache = (struct btrfs_block_group_cache *)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();
}
goto again;
}
if (!data_swap) {
- struct radix_tree_root *tmp = radix;
data_swap = 1;
- radix = swap_radix;
- swap_radix = tmp;
+ bit = BLOCK_GROUP_DATA | BLOCK_GROUP_METADATA;
last = search_start;
goto again;
}
- if (!found_group) {
- 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;
}
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_extent_item *item;
u32 refs;
+ WARN_ON(num_bytes < root->sectorsize);
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
- key.objectid = blocknr;
+ 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)
}
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 extent_buffer *l;
struct btrfs_extent_item *item;
+ WARN_ON(num_bytes < root->sectorsize);
path = btrfs_alloc_path();
- key.objectid = blocknr;
- key.offset = num_blocks;
+ 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);
goto out;
if (ret != 0) {
btrfs_print_leaf(root, path->nodes[0]);
- printk("failed to find block number %Lu\n", blocknr);
+ printk("failed to find block number %Lu\n", bytenr);
BUG();
}
l = path->nodes[0];
int btrfs_inc_root_ref(struct btrfs_trans_handle *trans,
struct btrfs_root *root)
{
- return btrfs_inc_extent_ref(trans, root,
- extent_buffer_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 extent_buffer *buf)
{
- u64 blocknr;
+ 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;
- leaf = btrfs_is_leaf(buf);
+ level = btrfs_header_level(buf);
nritems = btrfs_header_nritems(buf);
for (i = 0; i < nritems; i++) {
- if (leaf) {
- u64 disk_blocknr;
+ if (level == 0) {
+ u64 disk_bytenr;
btrfs_item_key_to_cpu(buf, &key, i);
if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
continue;
if (btrfs_file_extent_type(buf, fi) ==
BTRFS_FILE_EXTENT_INLINE)
continue;
- disk_blocknr = btrfs_file_extent_disk_blocknr(buf, fi);
- if (disk_blocknr == 0)
+ disk_bytenr = btrfs_file_extent_disk_bytenr(buf, fi);
+ if (disk_bytenr == 0)
continue;
- ret = btrfs_inc_extent_ref(trans, root, disk_blocknr,
- btrfs_file_extent_disk_num_blocks(buf, fi));
+ 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, i);
- ret = btrfs_inc_extent_ref(trans, root, blocknr, 1);
+ 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;
fail:
WARN_ON(1);
for (i =0; i < faili; i++) {
- if (leaf) {
- u64 disk_blocknr;
+ if (level == 0) {
+ u64 disk_bytenr;
btrfs_item_key_to_cpu(buf, &key, i);
if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
continue;
if (btrfs_file_extent_type(buf, fi) ==
BTRFS_FILE_EXTENT_INLINE)
continue;
- disk_blocknr = btrfs_file_extent_disk_blocknr(buf, fi);
- if (disk_blocknr == 0)
+ disk_bytenr = btrfs_file_extent_disk_bytenr(buf, fi);
+ if (disk_bytenr == 0)
continue;
- err = btrfs_free_extent(trans, root, disk_blocknr,
- btrfs_file_extent_disk_num_blocks(buf,
+ err = btrfs_free_extent(trans, root, disk_bytenr,
+ btrfs_file_extent_disk_num_bytes(buf,
fi), 0);
BUG_ON(err);
} else {
- blocknr = btrfs_node_blockptr(buf, i);
- err = btrfs_free_extent(trans, root, blocknr, 1, 0);
+ 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;
if (pending_ret)
return pending_ret;
- if (cache->data)
- cache->last_alloc = cache->first_free;
return 0;
}
-static int write_dirty_block_radix(struct btrfs_trans_handle *trans,
- struct btrfs_root *root,
- struct radix_tree_root *radix)
+int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans,
+ 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;
- int i;
struct btrfs_path *path;
- unsigned long off = 0;
+ 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,
- off, 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++) {
- err = write_one_cache_group(trans, root,
- path, cache[i]);
- /*
- * 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;
- 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);
+ cache = (struct btrfs_block_group_cache *)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;
}
-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, int mark_free,
- int data)
+ 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;
- u64 i;
- int ret;
+ u64 byte_in_group;
+ u64 start;
+ u64 end;
while(total) {
- cache = btrfs_lookup_block_group(info, 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(cache->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);
+ num_bytes = min(total, cache->key.offset - byte_in_group);
if (alloc) {
- 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);
+ int bit_to_clear;
+ int bit_to_set;
+ cache->data = data;
if (data) {
- cache->radix =
- &info->block_group_data_radix;
+ bit_to_clear = BLOCK_GROUP_DATA;
+ bit_to_set = BLOCK_GROUP_METADATA;
cache->item.flags |=
BTRFS_BLOCK_GROUP_DATA;
} else {
- cache->radix = &info->block_group_radix;
+ bit_to_clear = BLOCK_GROUP_METADATA;
+ bit_to_set = BLOCK_GROUP_DATA;
cache->item.flags &=
~BTRFS_BLOCK_GROUP_DATA;
}
- ret = radix_tree_insert(cache->radix,
- cache->key.objectid +
- cache->key.offset - 1,
- (void *)cache);
+ 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);
}
- old_val += num;
+ old_val += num_bytes;
} 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);
+ 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;
- blocknr += num;
+ total -= num_bytes;
+ bytenr += num_bytes;
}
return 0;
}
-int btrfs_copy_pinned(struct btrfs_root *root, struct radix_tree_root *copy)
+int btrfs_copy_pinned(struct btrfs_root *root, struct extent_map_tree *copy)
{
- unsigned long gang[8];
u64 last = 0;
- struct radix_tree_root *pinned_radix = &root->fs_info->pinned_radix;
+ u64 start;
+ u64 end;
+ struct extent_map_tree *pinned_extents = &root->fs_info->pinned_extents;
int ret;
- int i;
while(1) {
- ret = find_first_radix_bit(pinned_radix, gang, last,
- ARRAY_SIZE(gang));
- if (!ret)
+ ret = find_first_extent_bit(pinned_extents, last,
+ &start, &end, EXTENT_DIRTY);
+ if (ret)
break;
- for (i = 0 ; i < ret; i++) {
- set_radix_bit(copy, gang[i]);
- last = gang[i] + 1;
- }
+ set_extent_dirty(copy, start, end, GFP_NOFS);
+ last = end + 1;
}
- ret = find_first_radix_bit(&root->fs_info->extent_ins_radix, gang, 0,
- ARRAY_SIZE(gang));
- WARN_ON(ret);
return 0;
}
int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
- struct radix_tree_root *unpin_radix)
+ struct extent_map_tree *unpin)
{
- unsigned long gang[8];
- struct btrfs_block_group_cache *block_group;
- u64 first = 0;
+ u64 start;
+ u64 end;
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;
+ 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_radix_bit(unpin_radix, gang, 0,
- ARRAY_SIZE(gang));
- if (!ret)
+ ret = find_first_extent_bit(unpin, 0, &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]);
- 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 (!block_group->data)
- set_radix_bit(extent_radix, gang[i]);
- }
- }
+
+ 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;
}
{
struct btrfs_key ins;
struct btrfs_extent_item extent_item;
- int i;
int ret;
- int err;
- unsigned long gang[8];
+ int err = 0;
+ u64 start;
+ u64 end;
struct btrfs_fs_info *info = extent_root->fs_info;
btrfs_set_stack_extent_refs(&extent_item, 1);
- ins.offset = 1;
btrfs_set_key_type(&ins, BTRFS_EXTENT_ITEM_KEY);
btrfs_set_stack_extent_owner(&extent_item,
extent_root->root_key.objectid);
while(1) {
- ret = find_first_radix_bit(&info->extent_ins_radix, gang, 0,
- ARRAY_SIZE(gang));
- if (!ret)
+ ret = find_first_extent_bit(&info->extent_ins, 0, &start,
+ &end, EXTENT_LOCKED);
+ if (ret)
break;
- for (i = 0; i < ret; i++) {
- ins.objectid = gang[i];
- err = btrfs_insert_item(trans, extent_root, &ins,
- &extent_item,
- sizeof(extent_item));
- clear_radix_bit(&info->extent_ins_radix, gang[i]);
- WARN_ON(err);
- }
+ 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);
}
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;
+ int err = 0;
struct extent_buffer *buf;
if (!pending) {
- buf = btrfs_find_tree_block(root, blocknr);
+ buf = btrfs_find_tree_block(root, bytenr, num_bytes);
if (buf) {
if (btrfs_buffer_uptodate(buf)) {
u64 transid =
}
free_extent_buffer(buf);
}
- 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++;
- }
+ 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 < 0);
return 0;
* 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_extent_item *ei;
u32 refs;
- key.objectid = blocknr;
+ key.objectid = bytenr;
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
- key.offset = num_blocks;
+ key.offset = num_bytes;
path = btrfs_alloc_path();
if (!path)
btrfs_mark_buffer_dirty(leaf);
if (refs == 0) {
- u64 super_blocks_used, root_blocks_used;
+ u64 super_used;
+ u64 root_used;
if (pin) {
- ret = pin_down_block(root, blocknr, 0);
+ ret = pin_down_bytes(root, bytenr, num_bytes, 0);
BUG_ON(ret);
}
/* block accounting for super block */
- super_blocks_used = btrfs_super_blocks_used(&info->super_copy);
- btrfs_set_super_blocks_used(&info->super_copy,
- super_blocks_used - num_blocks);
+ 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_blocks_used = btrfs_root_used(&root->root_item);
+ root_used = btrfs_root_used(&root->root_item);
btrfs_set_root_used(&root->root_item,
- root_blocks_used - num_blocks);
+ root_used - num_bytes);
ret = btrfs_del_item(trans, extent_root, path);
if (ret) {
return ret;
}
- ret = update_block_group(trans, root, blocknr, num_blocks, 0,
+ ret = update_block_group(trans, root, bytenr, num_bytes, 0,
mark_free, 0);
BUG_ON(ret);
}
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;
- struct btrfs_block_group_cache *cache;
+ 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, 0,
- 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]);
- 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, 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;
}
* 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, pin == 0);
+ 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;
}
* 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 empty_size,
- u64 search_start, u64 search_end, u64 hint_block,
+ *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)
{
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 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;
+ u64 total_needed = num_bytes;
int level;
struct btrfs_block_group_cache *block_group;
int full_scan = 0;
int wrapped = 0;
- WARN_ON(num_blocks < 1);
+ WARN_ON(num_bytes < root->sectorsize);
btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
level = btrfs_header_level(root->node);
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);
+ 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_block, data, 1);
+ hint_byte, data, 1);
} else {
block_group = btrfs_find_block_group(root,
trans->block_group, 0,
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);
-
+ search_start = find_search_start(root, &block_group,
+ search_start, total_needed, data);
btrfs_init_path(path);
ins->objectid = search_start;
ins->offset = 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 = search_end - search_start;
start_found = 1;
goto check_pending;
}
- ins->objectid = last_block > search_start ?
- last_block : search_start;
+ 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_item_key_to_cpu(l, &key, slot);
- if (key.objectid >= search_start && key.objectid > last_block &&
+
+ if (key.objectid >= search_start && key.objectid > last_byte &&
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;
+ 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 (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;
- if (!full_scan && last_block >= block_group->key.objectid +
+ last_byte = key.objectid + key.offset;
+
+ if (!full_scan && 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 * 2;
+ block_group->key.offset;
goto new_group;
}
next:
btrfs_release_path(root, path);
BUG_ON(ins->objectid < search_start);
- if (ins->objectid + num_blocks >= search_end)
+ if (ins->objectid + num_bytes >= search_end)
goto enospc;
- for (test_block = ins->objectid;
- test_block < ins->objectid + num_blocks; test_block++) {
- if (test_radix_bit(&info->pinned_radix, test_block) ||
- test_radix_bit(&info->extent_ins_radix, test_block)) {
- search_start = test_block + 1;
- goto new_group;
- }
+ if (!full_scan && 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 (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 (exclude_nr > 0 && (ins->objectid + num_blocks > exclude_start &&
+ 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;
+ }
+ 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 (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_blocks >= search_end) {
+ if (search_start + num_bytes >= search_end) {
enospc:
search_start = orig_search_start;
if (full_scan) {
*/
int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 owner,
- u64 num_blocks, u64 empty_size, u64 hint_block,
+ 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, root_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;
btrfs_set_stack_extent_refs(&extent_item, 1);
btrfs_set_stack_extent_owner(&extent_item, owner);
- WARN_ON(num_blocks < 1);
- ret = find_free_extent(trans, root, num_blocks, empty_size,
- search_start, search_end, hint_block, 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);
return ret;
/* block accounting for super block */
- super_blocks_used = btrfs_super_blocks_used(&info->super_copy);
- btrfs_set_super_blocks_used(&info->super_copy, super_blocks_used +
- num_blocks);
+ 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_blocks_used = btrfs_root_used(&root->root_item);
- btrfs_set_root_used(&root->root_item, root_blocks_used +
- num_blocks);
+ 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) {
- BUG_ON(num_blocks != 1);
- set_radix_bit(&root->fs_info->extent_ins_radix, ins->objectid);
+ 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;
}
BUG_ON(ret);
finish_current_insert(trans, extent_root);
pending_ret = del_pending_extents(trans, extent_root);
+
if (ret) {
return ret;
}
* returns the tree buffer or NULL.
*/
struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, u64 hint,
+ struct btrfs_root *root,
+ u32 blocksize, u64 hint,
u64 empty_size)
{
struct btrfs_key ins;
struct extent_buffer *buf;
ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
- 1, empty_size, hint, (u64)-1, &ins, 0);
+ blocksize, empty_size, hint,
+ (u64)-1, &ins, 0);
if (ret) {
BUG_ON(ret > 0);
return ERR_PTR(ret);
}
- buf = btrfs_find_create_tree_block(root, ins.objectid);
+ buf = btrfs_find_create_tree_block(root, ins.objectid, blocksize);
if (!buf) {
- btrfs_free_extent(trans, root, ins.objectid, 1, 0);
+ 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_buffer_checked(buf);
- set_buffer_defrag(buf);
- */
- /* FIXME!!!!!!!!!!!!!!!!
- set_radix_bit(&trans->transaction->dirty_pages, buf->pages[0]->index);
- */
+ btrfs_set_buffer_defrag(buf);
trans->blocks_used++;
return buf;
}
BUG_ON(!btrfs_is_leaf(leaf));
nritems = btrfs_header_nritems(leaf);
for (i = 0; i < nritems; i++) {
- u64 disk_blocknr;
+ u64 disk_bytenr;
btrfs_item_key_to_cpu(leaf, &key, i);
if (btrfs_key_type(&key) != BTRFS_EXTENT_DATA_KEY)
* FIXME make sure to insert a trans record that
* repeats the snapshot del on crash
*/
- disk_blocknr = btrfs_file_extent_disk_blocknr(leaf, fi);
- if (disk_blocknr == 0)
+ disk_bytenr = btrfs_file_extent_disk_bytenr(leaf, fi);
+ if (disk_bytenr == 0)
continue;
- ret = btrfs_free_extent(trans, root, disk_blocknr,
- btrfs_file_extent_disk_num_blocks(leaf, fi), 0);
+ ret = btrfs_free_extent(trans, root, disk_bytenr,
+ btrfs_file_extent_disk_num_bytes(leaf, fi), 0);
BUG_ON(ret);
}
return 0;
{
int i;
u32 nritems;
- u64 blocknr;
+ 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++) {
- blocknr = btrfs_node_blockptr(node, i);
- ret = lookup_extent_ref(NULL, root, blocknr, 1, &refs);
+ 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, blocknr);
+ ret = readahead_tree_block(root, bytenr, blocksize);
cond_resched();
mutex_lock(&root->fs_info->fs_mutex);
if (ret)
{
struct extent_buffer *next;
struct extent_buffer *cur;
- u64 blocknr;
+ u64 bytenr;
+ u32 blocksize;
int ret;
u32 refs;
WARN_ON(*level < 0);
WARN_ON(*level >= BTRFS_MAX_LEVEL);
ret = lookup_extent_ref(trans, root,
- extent_buffer_blocknr(path->nodes[*level]),
- 1, &refs);
+ path->nodes[*level]->start,
+ path->nodes[*level]->len, &refs);
BUG_ON(ret);
if (refs > 1)
goto out;
BUG_ON(ret);
break;
}
- blocknr = btrfs_node_blockptr(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 = btrfs_find_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, blocknr);
+ 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, blocknr, 1, &refs);
+ 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,
- blocknr, 1, 1);
+ bytenr, blocksize, 1);
BUG_ON(ret);
continue;
}
out:
WARN_ON(*level < 0);
WARN_ON(*level >= BTRFS_MAX_LEVEL);
- ret = btrfs_free_extent(trans, root,
- extent_buffer_blocknr(path->nodes[*level]), 1, 1);
+ 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;
return 0;
} else {
ret = btrfs_free_extent(trans, root,
- extent_buffer_blocknr(path->nodes[*level]),
- 1, 1);
+ path->nodes[*level]->start,
+ path->nodes[*level]->len, 1);
BUG_ON(ret);
free_extent_buffer(path->nodes[*level]);
path->nodes[*level] = NULL;
orig_level = level;
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;
if (wret < 0)
ret = wret;
ret = -EAGAIN;
- extent_buffer_get(root->node);
break;
}
for (i = 0; i <= orig_level; i++) {
return ret;
}
-static int free_block_group_radix(struct radix_tree_root *radix)
+int btrfs_free_block_groups(struct btrfs_fs_info *info)
{
+ u64 start;
+ u64 end;
int ret;
- struct btrfs_block_group_cache *cache[8];
- int i;
while(1) {
- ret = radix_tree_gang_lookup(radix, (void **)cache, 0,
- ARRAY_SIZE(cache));
- if (!ret)
+ ret = find_first_extent_bit(&info->block_group_cache, 0,
+ &start, &end, (unsigned int)-1);
+ if (ret)
break;
- for (i = 0; i < ret; i++) {
- radix_tree_delete(radix, cache[i]->key.objectid +
- cache[i]->key.offset - 1);
- kfree(cache[i]);
- }
+ clear_extent_bits(&info->block_group_cache, start,
+ end, (unsigned int)-1, GFP_NOFS);
}
- 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)
+ ret = find_first_extent_bit(&info->free_space_cache, 0,
+ &start, &end, EXTENT_DIRTY);
+ if (ret)
break;
- for (i = 0; i < ret; i++) {
- clear_radix_bit(&info->extent_map_radix, gang[i]);
- }
+ clear_extent_dirty(&info->free_space_cache, start,
+ end, GFP_NOFS);
}
return 0;
}
struct btrfs_path *path;
int ret;
int err = 0;
+ int bit;
struct btrfs_block_group_cache *cache;
struct btrfs_fs_info *info = root->fs_info;
- struct radix_tree_root *radix;
+ struct extent_map_tree *block_group_cache;
struct btrfs_key key;
struct btrfs_key found_key;
struct extent_buffer *leaf;
- u64 group_size_blocks;
- u64 used;
- group_size_blocks = BTRFS_BLOCK_GROUP_SIZE >>
- root->fs_info->sb->s_blocksize_bits;
+ block_group_cache = &info->block_group_cache;
+
root = info->extent_root;
key.objectid = 0;
- key.offset = group_size_blocks;
+ key.offset = BTRFS_BLOCK_GROUP_SIZE;
btrfs_set_key_type(&key, BTRFS_BLOCK_GROUP_ITEM_KEY);
path = btrfs_alloc_path();
read_extent_buffer(leaf, &cache->item,
btrfs_item_ptr_offset(leaf, path->slots[0]),
sizeof(cache->item));
- if (cache->item.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->key, &found_key, sizeof(found_key));
- cache->last_alloc = cache->key.objectid;
- cache->first_free = 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(radix, found_key.objectid +
- found_key.offset - 1,
- (void *)cache);
- BUG_ON(ret);
- used = btrfs_block_group_used(&cache->item);
- if (used < div_factor(key.offset, 8)) {
- radix_tree_tag_set(radix, found_key.objectid +
- found_key.offset - 1,
- BTRFS_BLOCK_GROUP_AVAIL);
+ if (cache->item.flags & BTRFS_BLOCK_GROUP_DATA) {
+ bit = BLOCK_GROUP_DATA;
+ cache->data = 1;
+ } 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,
+ (u64)cache);
+
if (key.objectid >=
- btrfs_super_total_blocks(&info->super_copy))
+ btrfs_super_total_bytes(&info->super_copy))
break;
}
projects / karo-tx-linux.git / blobdiff