* Boston, MA 021110-1307, USA.
*/
-#include <linux/highmem.h>
+#include <linux/sched.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
*root, struct btrfs_path *path, int level);
static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
*root, struct btrfs_key *ins_key,
- struct btrfs_path *path, int data_size);
+ struct btrfs_path *path, int data_size, int extend);
static int push_node_left(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct extent_buffer *dst,
struct extent_buffer *src);
WARN_ON(root->ref_cows && trans->transid != root->last_trans);
- cow = btrfs_alloc_free_block(trans, root, search_start, empty_size);
+ cow = btrfs_alloc_free_block(trans, root, buf->len,
+ search_start, empty_size);
if (IS_ERR(cow))
return PTR_ERR(cow);
- if (buf->len != root->sectorsize || cow->len != root->sectorsize)
- WARN_ON(1);
-
copy_extent_buffer(cow, buf, 0, 0, cow->len);
- btrfs_set_header_blocknr(cow, extent_buffer_blocknr(cow));
+ btrfs_set_header_bytenr(cow, cow->start);
btrfs_set_header_generation(cow, trans->transid);
btrfs_set_header_owner(cow, root->root_key.objectid);
root->node = cow;
extent_buffer_get(cow);
if (buf != root->commit_root) {
- btrfs_free_extent(trans, root,
- extent_buffer_blocknr(buf), 1, 1);
+ btrfs_free_extent(trans, root, buf->start,
+ buf->len, 1);
}
free_extent_buffer(buf);
} else {
btrfs_set_node_blockptr(parent, parent_slot,
- extent_buffer_blocknr(cow));
+ cow->start);
btrfs_mark_buffer_dirty(parent);
WARN_ON(btrfs_header_generation(parent) != trans->transid);
- btrfs_free_extent(trans, root, extent_buffer_blocknr(buf),1,1);
+ btrfs_free_extent(trans, root, buf->start, buf->len, 1);
}
free_extent_buffer(buf);
btrfs_mark_buffer_dirty(cow);
struct extent_buffer **cow_ret)
{
u64 search_start;
+ int ret;
if (trans->transaction != root->fs_info->running_transaction) {
printk(KERN_CRIT "trans %Lu running %Lu\n", trans->transid,
root->fs_info->running_transaction->transid);
return 0;
}
- search_start = extent_buffer_blocknr(buf) & ~((u64)65535);
- return __btrfs_cow_block(trans, root, buf, parent,
+ search_start = buf->start & ~((u64)BTRFS_BLOCK_GROUP_SIZE - 1);
+ ret = __btrfs_cow_block(trans, root, buf, parent,
parent_slot, cow_ret, search_start, 0);
+ return ret;
}
-static int close_blocks(u64 blocknr, u64 other)
+static int close_blocks(u64 blocknr, u64 other, u32 blocksize)
{
- if (blocknr < other && other - blocknr < 8)
+ if (blocknr < other && other - (blocknr + blocksize) < 32768)
return 1;
- if (blocknr > other && blocknr - other < 8)
+ if (blocknr > other && blocknr - (other + blocksize) < 32768)
return 1;
return 0;
}
-#if 0
-static int should_defrag_leaf(struct extent_buffer *eb)
+/*
+ * compare two keys in a memcmp fashion
+ */
+static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
{
- return 0;
- struct btrfs_leaf *leaf = btrfs_buffer_leaf(eb);
- struct btrfs_disk_key *key;
- u32 nritems;
-
- if (buffer_defrag(bh))
- return 1;
+ struct btrfs_key k1;
- nritems = btrfs_header_nritems(&leaf->header);
- if (nritems == 0)
- return 0;
+ btrfs_disk_key_to_cpu(&k1, disk);
- key = &leaf->items[0].key;
- if (btrfs_disk_key_type(key) == BTRFS_DIR_ITEM_KEY)
+ if (k1.objectid > k2->objectid)
return 1;
-
- key = &leaf->items[nritems-1].key;
- if (btrfs_disk_key_type(key) == BTRFS_DIR_ITEM_KEY)
+ if (k1.objectid < k2->objectid)
+ return -1;
+ if (k1.type > k2->type)
return 1;
- if (nritems > 4) {
- key = &leaf->items[nritems/2].key;
- if (btrfs_disk_key_type(key) == BTRFS_DIR_ITEM_KEY)
- return 1;
- }
+ if (k1.type < k2->type)
+ return -1;
+ if (k1.offset > k2->offset)
+ return 1;
+ if (k1.offset < k2->offset)
+ return -1;
return 0;
}
-#endif
+
int btrfs_realloc_node(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct extent_buffer *parent,
- int cache_only, u64 *last_ret)
+ int start_slot, int cache_only, u64 *last_ret,
+ struct btrfs_key *progress)
{
- return 0;
-#if 0
- struct btrfs_node *parent_node;
- struct extent_buffer *cur_eb;
- struct extent_buffer *tmp_eb;
+ struct extent_buffer *cur;
+ struct extent_buffer *tmp;
u64 blocknr;
u64 search_start = *last_ret;
u64 last_block = 0;
u64 other;
u32 parent_nritems;
- int start_slot;
int end_slot;
int i;
int err = 0;
int parent_level;
+ int uptodate;
+ u32 blocksize;
+ int progress_passed = 0;
+ struct btrfs_disk_key disk_key;
+
+ parent_level = btrfs_header_level(parent);
+ if (cache_only && parent_level != 1)
+ return 0;
if (trans->transaction != root->fs_info->running_transaction) {
printk(KERN_CRIT "trans %Lu running %Lu\n", trans->transid,
root->fs_info->generation);
WARN_ON(1);
}
- if (buffer_defrag_done(parent))
- return 0;
-
- parent_node = btrfs_buffer_node(parent);
- parent_nritems = btrfs_header_nritems(&parent_node->header);
- parent_level = btrfs_header_level(&parent_node->header);
- start_slot = 0;
+ parent_nritems = btrfs_header_nritems(parent);
+ blocksize = btrfs_level_size(root, parent_level - 1);
end_slot = parent_nritems;
if (parent_nritems == 1)
for (i = start_slot; i < end_slot; i++) {
int close = 1;
- blocknr = btrfs_node_blockptr(parent_node, i);
+
+ if (!parent->map_token) {
+ map_extent_buffer(parent,
+ btrfs_node_key_ptr_offset(i),
+ sizeof(struct btrfs_key_ptr),
+ &parent->map_token, &parent->kaddr,
+ &parent->map_start, &parent->map_len,
+ KM_USER1);
+ }
+ btrfs_node_key(parent, &disk_key, i);
+ if (!progress_passed && comp_keys(&disk_key, progress) < 0)
+ continue;
+
+ progress_passed = 1;
+ blocknr = btrfs_node_blockptr(parent, i);
if (last_block == 0)
last_block = blocknr;
+
if (i > 0) {
- other = btrfs_node_blockptr(parent_node, i - 1);
- close = close_blocks(blocknr, other);
+ other = btrfs_node_blockptr(parent, i - 1);
+ close = close_blocks(blocknr, other, blocksize);
}
- if (close && i < end_slot - 1) {
- other = btrfs_node_blockptr(parent_node, i + 1);
- close = close_blocks(blocknr, other);
+ if (close && i < end_slot - 2) {
+ other = btrfs_node_blockptr(parent, i + 1);
+ close = close_blocks(blocknr, other, blocksize);
}
if (close) {
last_block = blocknr;
continue;
}
+ if (parent->map_token) {
+ unmap_extent_buffer(parent, parent->map_token,
+ KM_USER1);
+ parent->map_token = NULL;
+ }
- cur_bh = btrfs_find_tree_block(root, blocknr);
- if (!cur_bh || !buffer_uptodate(cur_bh) ||
- buffer_locked(cur_bh) ||
- (parent_level != 1 && !buffer_defrag(cur_bh)) ||
- (parent_level == 1 && !should_defrag_leaf(cur_bh))) {
+ cur = btrfs_find_tree_block(root, blocknr, blocksize);
+ if (cur)
+ uptodate = btrfs_buffer_uptodate(cur);
+ else
+ uptodate = 0;
+ if (!cur || !uptodate) {
if (cache_only) {
- brelse(cur_bh);
+ free_extent_buffer(cur);
continue;
}
- if (!cur_bh || !buffer_uptodate(cur_bh) ||
- buffer_locked(cur_bh)) {
- brelse(cur_bh);
- cur_bh = read_tree_block(root, blocknr);
+ if (!cur) {
+ cur = read_tree_block(root, blocknr,
+ blocksize);
+ } else if (!uptodate) {
+ btrfs_read_buffer(cur);
}
}
if (search_start == 0)
- search_start = last_block & ~((u64)65535);
+ search_start = last_block;
- err = __btrfs_cow_block(trans, root, cur_bh, parent, i,
- &tmp_bh, search_start,
- min(8, end_slot - i));
+ err = __btrfs_cow_block(trans, root, cur, parent, i,
+ &tmp, search_start,
+ min(16 * blocksize,
+ (end_slot - i) * blocksize));
if (err) {
- brelse(cur_bh);
+ free_extent_buffer(cur);
break;
}
- search_start = bh_blocknr(tmp_bh);
+ search_start = tmp->start;
+ last_block = tmp->start;
*last_ret = search_start;
if (parent_level == 1)
- clear_buffer_defrag(tmp_bh);
- set_buffer_defrag_done(tmp_bh);
- brelse(tmp_bh);
+ btrfs_clear_buffer_defrag(tmp);
+ free_extent_buffer(tmp);
+ }
+ if (parent->map_token) {
+ unmap_extent_buffer(parent, parent->map_token,
+ KM_USER1);
+ parent->map_token = NULL;
}
return err;
-#endif
}
/*
return btrfs_item_offset_nr(leaf, nr - 1);
}
-/*
- * compare two keys in a memcmp fashion
- */
-static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
-{
- struct btrfs_key k1;
-
- btrfs_disk_key_to_cpu(&k1, disk);
-
- if (k1.objectid > k2->objectid)
- return 1;
- if (k1.objectid < k2->objectid)
- return -1;
- if (k1.type > k2->type)
- return 1;
- if (k1.type < k2->type)
- return -1;
- if (k1.offset > k2->offset)
- return 1;
- if (k1.offset < k2->offset)
- return -1;
- return 0;
-}
-
static int check_node(struct btrfs_root *root, struct btrfs_path *path,
int level)
{
BUG_ON(memcmp(&parent_key, &node_key,
sizeof(struct btrfs_disk_key)));
BUG_ON(btrfs_node_blockptr(parent, parent_slot) !=
- btrfs_header_blocknr(node));
+ btrfs_header_bytenr(node));
}
BUG_ON(nritems > BTRFS_NODEPTRS_PER_BLOCK(root));
if (slot != 0) {
BUG_ON(memcmp(&parent_key, &leaf_key,
sizeof(struct btrfs_disk_key)));
BUG_ON(btrfs_node_blockptr(parent, parent_slot) !=
- btrfs_header_blocknr(leaf));
+ btrfs_header_bytenr(leaf));
}
#if 0
for (i = 0; nritems > 1 && i < nritems - 2; i++) {
static int check_block(struct btrfs_root *root, struct btrfs_path *path,
int level)
{
+ return 0;
+#if 0
struct extent_buffer *buf = path->nodes[level];
if (memcmp_extent_buffer(buf, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(buf),
BTRFS_FSID_SIZE)) {
printk("warning bad block %Lu\n", buf->start);
- BUG();
+ return 1;
}
+#endif
if (level == 0)
return check_leaf(root, path, level);
return check_node(root, path, level);
return NULL;
if (slot >= btrfs_header_nritems(parent))
return NULL;
- return read_tree_block(root, btrfs_node_blockptr(parent, slot));
+ return read_tree_block(root, btrfs_node_blockptr(parent, slot),
+ btrfs_level_size(root, btrfs_header_level(parent) - 1));
}
static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
*/
if (!parent) {
struct extent_buffer *child;
- u64 blocknr = extent_buffer_blocknr(mid);
if (btrfs_header_nritems(mid) != 1)
return 0;
wait_on_tree_block_writeback(root, mid);
/* once for the path */
free_extent_buffer(mid);
+ ret = btrfs_free_extent(trans, root, mid->start, mid->len, 1);
/* once for the root ptr */
free_extent_buffer(mid);
- return btrfs_free_extent(trans, root, blocknr, 1, 1);
+ return ret;
}
if (btrfs_header_nritems(mid) >
BTRFS_NODEPTRS_PER_BLOCK(root) / 4)
if (wret < 0 && wret != -ENOSPC)
ret = wret;
if (btrfs_header_nritems(right) == 0) {
- u64 blocknr = extent_buffer_blocknr(right);
+ u64 bytenr = right->start;
+ u32 blocksize = right->len;
+
clean_tree_block(trans, root, right);
wait_on_tree_block_writeback(root, right);
free_extent_buffer(right);
1);
if (wret)
ret = wret;
- wret = btrfs_free_extent(trans, root, blocknr, 1, 1);
+ wret = btrfs_free_extent(trans, root, bytenr,
+ blocksize, 1);
if (wret)
ret = wret;
} else {
}
if (btrfs_header_nritems(mid) == 0) {
/* we've managed to empty the middle node, drop it */
- u64 blocknr = extent_buffer_blocknr(mid);
+ u64 bytenr = mid->start;
+ u32 blocksize = mid->len;
clean_tree_block(trans, root, mid);
wait_on_tree_block_writeback(root, mid);
free_extent_buffer(mid);
wret = del_ptr(trans, root, path, level + 1, pslot);
if (wret)
ret = wret;
- wret = btrfs_free_extent(trans, root, blocknr, 1, 1);
+ wret = btrfs_free_extent(trans, root, bytenr, blocksize, 1);
if (wret)
ret = wret;
} else {
path->slots[level] = orig_slot;
free_extent_buffer(left);
}
- check_node(root, path, level);
return 0;
}
free_extent_buffer(left);
} else {
free_extent_buffer(right);
}
- check_node(root, path, level);
return 0;
}
free_extent_buffer(right);
}
- check_node(root, path, level);
return 1;
}
int level, int slot)
{
struct extent_buffer *node;
- int i;
u32 nritems;
- u64 blocknr;
u64 search;
- u64 cluster_start;
- int ret;
- int nread = 0;
+ u64 lowest_read;
+ u64 highest_read;
+ u64 nread = 0;
int direction = path->reada;
- struct radix_tree_root found;
- unsigned long gang[8];
struct extent_buffer *eb;
+ u32 nr;
+ u32 blocksize;
+ u32 nscan = 0;
- if (level == 0)
+ if (level != 1)
return;
if (!path->nodes[level])
node = path->nodes[level];
search = btrfs_node_blockptr(node, slot);
- eb = btrfs_find_tree_block(root, search);
+ blocksize = btrfs_level_size(root, level - 1);
+ eb = btrfs_find_tree_block(root, search, blocksize);
if (eb) {
free_extent_buffer(eb);
return;
}
- init_bit_radix(&found);
+ highest_read = search;
+ lowest_read = search;
+
nritems = btrfs_header_nritems(node);
- for (i = slot; i < nritems; i++) {
- blocknr = btrfs_node_blockptr(node, i);
- set_radix_bit(&found, blocknr);
- }
- if (direction > 0) {
- cluster_start = search - 4;
- if (cluster_start > search)
- cluster_start = 0;
- } else
- cluster_start = search + 4;
+ nr = slot;
while(1) {
- ret = find_first_radix_bit(&found, gang, 0, ARRAY_SIZE(gang));
- if (!ret)
- break;
- for (i = 0; i < ret; i++) {
- blocknr = gang[i];
- clear_radix_bit(&found, blocknr);
- if (path->reada == 1 && nread > 16)
- continue;
- if (close_blocks(cluster_start, blocknr)) {
- readahead_tree_block(root, blocknr);
- nread++;
- cluster_start = blocknr;
- }
+ if (direction < 0) {
+ if (nr == 0)
+ break;
+ nr--;
+ } else if (direction > 0) {
+ nr++;
+ if (nr >= nritems)
+ break;
}
+ search = btrfs_node_blockptr(node, nr);
+ if ((search >= lowest_read && search <= highest_read) ||
+ (search < lowest_read && lowest_read - search <= 32768) ||
+ (search > highest_read && search - highest_read <= 32768)) {
+ readahead_tree_block(root, search, blocksize);
+ nread += blocksize;
+ }
+ nscan++;
+ if (path->reada < 2 && (nread > (256 * 1024) || nscan > 32))
+ break;
+ if(nread > (1024 * 1024) || nscan > 128)
+ break;
+
+ if (search < lowest_read)
+ lowest_read = search;
+ if (search > highest_read)
+ highest_read = search;
}
}
/*
ins_len, int cow)
{
struct extent_buffer *b;
- u64 blocknr;
+ u64 bytenr;
int slot;
int ret;
int level;
if (sret)
return sret;
b = p->nodes[level];
- if (!b)
+ if (!b) {
+ btrfs_release_path(NULL, p);
goto again;
+ }
slot = p->slots[level];
BUG_ON(btrfs_header_nritems(b) == 1);
}
/* this is only true while dropping a snapshot */
if (level == lowest_level)
break;
- blocknr = btrfs_node_blockptr(b, slot);
+ bytenr = btrfs_node_blockptr(b, slot);
if (should_reada)
reada_for_search(root, p, level, slot);
- b = read_tree_block(root, btrfs_node_blockptr(b, slot));
+ b = read_tree_block(root, bytenr,
+ btrfs_level_size(root, level - 1));
} else {
p->slots[level] = slot;
if (ins_len > 0 && btrfs_leaf_free_space(root, b) <
sizeof(struct btrfs_item) + ins_len) {
int sret = split_leaf(trans, root, key,
- p, ins_len);
+ p, ins_len, ret == 0);
BUG_ON(sret > 0);
if (sret)
return sret;
BUG_ON(path->nodes[level]);
BUG_ON(path->nodes[level-1] != root->node);
- c = btrfs_alloc_free_block(trans, root,
- extent_buffer_blocknr(root->node), 0);
+ c = btrfs_alloc_free_block(trans, root, root->nodesize,
+ root->node->start, 0);
if (IS_ERR(c))
return PTR_ERR(c);
memset_extent_buffer(c, 0, 0, root->nodesize);
btrfs_set_header_nritems(c, 1);
btrfs_set_header_level(c, level);
- btrfs_set_header_blocknr(c, extent_buffer_blocknr(c));
+ btrfs_set_header_bytenr(c, c->start);
btrfs_set_header_generation(c, trans->transid);
btrfs_set_header_owner(c, root->root_key.objectid);
lower = path->nodes[level-1];
else
btrfs_node_key(lower, &lower_key, 0);
btrfs_set_node_key(c, &lower_key, 0);
- btrfs_set_node_blockptr(c, 0, extent_buffer_blocknr(lower));
+ btrfs_set_node_blockptr(c, 0, lower->start);
btrfs_mark_buffer_dirty(c);
*/
static int insert_ptr(struct btrfs_trans_handle *trans, struct btrfs_root
*root, struct btrfs_path *path, struct btrfs_disk_key
- *key, u64 blocknr, int slot, int level)
+ *key, u64 bytenr, int slot, int level)
{
struct extent_buffer *lower;
int nritems;
(nritems - slot) * sizeof(struct btrfs_key_ptr));
}
btrfs_set_node_key(lower, key, slot);
- btrfs_set_node_blockptr(lower, slot, blocknr);
+ btrfs_set_node_blockptr(lower, slot, bytenr);
btrfs_set_header_nritems(lower, nritems + 1);
btrfs_mark_buffer_dirty(lower);
- check_node(root, path, level);
return 0;
}
}
c_nritems = btrfs_header_nritems(c);
- split = btrfs_alloc_free_block(trans, root,
- extent_buffer_blocknr(c), 0);
+ split = btrfs_alloc_free_block(trans, root, root->nodesize,
+ c->start, 0);
if (IS_ERR(split))
return PTR_ERR(split);
btrfs_set_header_flags(split, btrfs_header_flags(c));
btrfs_set_header_level(split, btrfs_header_level(c));
- btrfs_set_header_blocknr(split, extent_buffer_blocknr(split));
+ btrfs_set_header_bytenr(split, split->start);
btrfs_set_header_generation(split, trans->transid);
btrfs_set_header_owner(split, root->root_key.objectid);
write_extent_buffer(split, root->fs_info->fsid,
btrfs_mark_buffer_dirty(split);
btrfs_node_key(split, &disk_key, 0);
- wret = insert_ptr(trans, root, path, &disk_key,
- extent_buffer_blocknr(split),
+ wret = insert_ptr(trans, root, path, &disk_key, split->start,
path->slots[level + 1] + 1,
level + 1);
if (wret)
ret = BTRFS_LEAF_DATA_SIZE(root) - leaf_space_used(leaf, 0, nritems);
if (ret < 0) {
printk("leaf free space ret %d, leaf data size %lu, used %d nritems %d\n",
- ret, BTRFS_LEAF_DATA_SIZE(root),
+ ret, (unsigned long) BTRFS_LEAF_DATA_SIZE(root),
leaf_space_used(leaf, 0, nritems), nritems);
}
return ret;
* room, 0 if everything worked out and < 0 if there were major errors.
*/
static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, struct btrfs_path *path, int data_size)
+ *root, struct btrfs_path *path, int data_size,
+ int empty)
{
struct extent_buffer *left = path->nodes[0];
struct extent_buffer *right;
struct extent_buffer *upper;
struct btrfs_disk_key disk_key;
int slot;
- int i;
+ u32 i;
int free_space;
int push_space = 0;
int push_items = 0;
struct btrfs_item *item;
u32 left_nritems;
+ u32 nr;
u32 right_nritems;
u32 data_end;
+ u32 this_item_size;
int ret;
slot = path->slots[1];
if (slot >= btrfs_header_nritems(upper) - 1)
return 1;
- right = read_tree_block(root, btrfs_node_blockptr(upper, slot + 1));
+ right = read_tree_block(root, btrfs_node_blockptr(upper, slot + 1),
+ root->leafsize);
free_space = btrfs_leaf_free_space(root, right);
if (free_space < data_size + sizeof(struct btrfs_item)) {
free_extent_buffer(right);
return 1;
}
- for (i = left_nritems - 1; i >= 1; i--) {
+ if (empty)
+ nr = 0;
+ else
+ nr = 1;
+
+ i = left_nritems - 1;
+ while (i >= nr) {
item = btrfs_item_nr(left, i);
+
if (path->slots[0] == i)
push_space += data_size + sizeof(*item);
- if (btrfs_item_size(left, item) + sizeof(*item) + push_space >
- free_space)
+
+ if (!left->map_token) {
+ map_extent_buffer(left, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &left->map_token, &left->kaddr,
+ &left->map_start, &left->map_len,
+ KM_USER1);
+ }
+
+ this_item_size = btrfs_item_size(left, item);
+ if (this_item_size + sizeof(*item) + push_space > free_space)
break;
push_items++;
- push_space += btrfs_item_size(left, item) + sizeof(*item);
+ push_space += this_item_size + sizeof(*item);
+ if (i == 0)
+ break;
+ i--;
+ }
+ if (left->map_token) {
+ unmap_extent_buffer(left, left->map_token, KM_USER1);
+ left->map_token = NULL;
}
if (push_items == 0) {
return 1;
}
- if (push_items == left_nritems)
+ if (!empty && push_items == left_nritems)
WARN_ON(1);
/* push left to right */
right_nritems = btrfs_header_nritems(right);
+
push_space = btrfs_item_end_nr(left, left_nritems - push_items);
push_space -= leaf_data_end(root, left);
push_space = BTRFS_LEAF_DATA_SIZE(root);
for (i = 0; i < right_nritems; i++) {
item = btrfs_item_nr(right, i);
- btrfs_set_item_offset(right, item, push_space -
- btrfs_item_size(right, item));
- push_space = btrfs_item_offset(right, item);
+ if (!right->map_token) {
+ map_extent_buffer(right, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &right->map_token, &right->kaddr,
+ &right->map_start, &right->map_len,
+ KM_USER1);
+ }
+ push_space -= btrfs_item_size(right, item);
+ btrfs_set_item_offset(right, item, push_space);
+ }
+
+ if (right->map_token) {
+ unmap_extent_buffer(right, right->map_token, KM_USER1);
+ right->map_token = NULL;
}
left_nritems -= push_items;
btrfs_set_header_nritems(left, left_nritems);
- btrfs_mark_buffer_dirty(left);
+ if (left_nritems)
+ btrfs_mark_buffer_dirty(left);
btrfs_mark_buffer_dirty(right);
btrfs_item_key(right, &disk_key, 0);
} else {
free_extent_buffer(right);
}
- if (path->nodes[1])
- check_node(root, path, 1);
return 0;
}
/*
* least data_size bytes. returns zero if the push worked, nonzero otherwise
*/
static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
- *root, struct btrfs_path *path, int data_size)
+ *root, struct btrfs_path *path, int data_size,
+ int empty)
{
struct btrfs_disk_key disk_key;
struct extent_buffer *right = path->nodes[0];
struct btrfs_item *item;
u32 old_left_nritems;
u32 right_nritems;
+ u32 nr;
int ret = 0;
int wret;
+ u32 this_item_size;
+ u32 old_left_item_size;
slot = path->slots[1];
if (slot == 0)
if (!path->nodes[1])
return 1;
+ right_nritems = btrfs_header_nritems(right);
+ if (right_nritems == 0) {
+ return 1;
+ }
+
left = read_tree_block(root, btrfs_node_blockptr(path->nodes[1],
- slot - 1));
+ slot - 1), root->leafsize);
free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) {
free_extent_buffer(left);
free_extent_buffer(left);
return 1;
}
+
free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) {
free_extent_buffer(left);
return 1;
}
- right_nritems = btrfs_header_nritems(right);
- if (right_nritems == 0) {
- free_extent_buffer(left);
- return 1;
- }
+ if (empty)
+ nr = right_nritems;
+ else
+ nr = right_nritems - 1;
- for (i = 0; i < right_nritems - 1; i++) {
+ for (i = 0; i < nr; i++) {
item = btrfs_item_nr(right, i);
+ if (!right->map_token) {
+ map_extent_buffer(right, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &right->map_token, &right->kaddr,
+ &right->map_start, &right->map_len,
+ KM_USER1);
+ }
+
if (path->slots[0] == i)
push_space += data_size + sizeof(*item);
- if (btrfs_item_size(right, item) + sizeof(*item) + push_space >
- free_space)
+
+ this_item_size = btrfs_item_size(right, item);
+ if (this_item_size + sizeof(*item) + push_space > free_space)
break;
+
push_items++;
- push_space += btrfs_item_size(right, item) + sizeof(*item);
+ push_space += this_item_size + sizeof(*item);
}
+
+ if (right->map_token) {
+ unmap_extent_buffer(right, right->map_token, KM_USER1);
+ right->map_token = NULL;
+ }
+
if (push_items == 0) {
free_extent_buffer(left);
return 1;
}
- if (push_items == btrfs_header_nritems(right))
+ if (!empty && push_items == btrfs_header_nritems(right))
WARN_ON(1);
/* push data from right to left */
old_left_nritems = btrfs_header_nritems(left);
BUG_ON(old_left_nritems < 0);
+ old_left_item_size = btrfs_item_offset_nr(left, old_left_nritems - 1);
for (i = old_left_nritems; i < old_left_nritems + push_items; i++) {
u32 ioff;
+
item = btrfs_item_nr(left, i);
+ if (!left->map_token) {
+ map_extent_buffer(left, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &left->map_token, &left->kaddr,
+ &left->map_start, &left->map_len,
+ KM_USER1);
+ }
+
ioff = btrfs_item_offset(left, item);
btrfs_set_item_offset(left, item,
- ioff - (BTRFS_LEAF_DATA_SIZE(root) -
- btrfs_item_offset_nr(left, old_left_nritems - 1)));
+ ioff - (BTRFS_LEAF_DATA_SIZE(root) - old_left_item_size));
}
btrfs_set_header_nritems(left, old_left_nritems + push_items);
+ if (left->map_token) {
+ unmap_extent_buffer(left, left->map_token, KM_USER1);
+ left->map_token = NULL;
+ }
/* fixup right node */
- push_space = btrfs_item_offset_nr(right, push_items - 1) -
- leaf_data_end(root, right);
- memmove_extent_buffer(right, btrfs_leaf_data(right) +
- BTRFS_LEAF_DATA_SIZE(root) - push_space,
- btrfs_leaf_data(right) +
- leaf_data_end(root, right), push_space);
-
- memmove_extent_buffer(right, btrfs_item_nr_offset(0),
+ if (push_items > right_nritems) {
+ printk("push items %d nr %u\n", push_items, right_nritems);
+ WARN_ON(1);
+ }
+
+ if (push_items < right_nritems) {
+ push_space = btrfs_item_offset_nr(right, push_items - 1) -
+ leaf_data_end(root, right);
+ memmove_extent_buffer(right, btrfs_leaf_data(right) +
+ BTRFS_LEAF_DATA_SIZE(root) - push_space,
+ btrfs_leaf_data(right) +
+ leaf_data_end(root, right), push_space);
+
+ memmove_extent_buffer(right, btrfs_item_nr_offset(0),
btrfs_item_nr_offset(push_items),
(btrfs_header_nritems(right) - push_items) *
sizeof(struct btrfs_item));
- right_nritems = btrfs_header_nritems(right) - push_items;
- btrfs_set_header_nritems(right, right_nritems);
+ }
+ btrfs_set_header_nritems(right, right_nritems - push_items);
push_space = BTRFS_LEAF_DATA_SIZE(root);
for (i = 0; i < right_nritems; i++) {
item = btrfs_item_nr(right, i);
- btrfs_set_item_offset(right, item, push_space -
- btrfs_item_size(right, item));
- push_space = btrfs_item_offset(right, item);
+
+ if (!right->map_token) {
+ map_extent_buffer(right, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &right->map_token, &right->kaddr,
+ &right->map_start, &right->map_len,
+ KM_USER1);
+ }
+
+ push_space = push_space - btrfs_item_size(right, item);
+ btrfs_set_item_offset(right, item, push_space);
+ }
+ if (right->map_token) {
+ unmap_extent_buffer(right, right->map_token, KM_USER1);
+ right->map_token = NULL;
}
btrfs_mark_buffer_dirty(left);
- btrfs_mark_buffer_dirty(right);
+ if (right_nritems)
+ btrfs_mark_buffer_dirty(right);
btrfs_item_key(right, &disk_key, 0);
wret = fixup_low_keys(trans, root, path, &disk_key, 1);
path->slots[0] -= push_items;
}
BUG_ON(path->slots[0] < 0);
- if (path->nodes[1])
- check_node(root, path, 1);
return ret;
}
*/
static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
*root, struct btrfs_key *ins_key,
- struct btrfs_path *path, int data_size)
+ struct btrfs_path *path, int data_size, int extend)
{
struct extent_buffer *l;
u32 nritems;
int i;
int ret = 0;
int wret;
- int double_split = 0;
+ int double_split;
+ int num_doubles = 0;
struct btrfs_disk_key disk_key;
+ if (extend)
+ space_needed = data_size;
+
/* first try to make some room by pushing left and right */
- wret = push_leaf_left(trans, root, path, data_size);
- if (wret < 0)
- return wret;
- if (wret) {
- wret = push_leaf_right(trans, root, path, data_size);
- if (wret < 0)
+ if (ins_key->type != BTRFS_DIR_ITEM_KEY) {
+ wret = push_leaf_right(trans, root, path, data_size, 0);
+ if (wret < 0) {
return wret;
- }
- l = path->nodes[0];
+ }
+ if (wret) {
+ wret = push_leaf_left(trans, root, path, data_size, 0);
+ if (wret < 0)
+ return wret;
+ }
+ l = path->nodes[0];
- /* did the pushes work? */
- if (btrfs_leaf_free_space(root, l) >=
- sizeof(struct btrfs_item) + data_size)
- return 0;
+ /* did the pushes work? */
+ if (btrfs_leaf_free_space(root, l) >= space_needed)
+ return 0;
+ }
if (!path->nodes[1]) {
ret = insert_new_root(trans, root, path, 1);
if (ret)
return ret;
}
+again:
+ double_split = 0;
+ l = path->nodes[0];
slot = path->slots[0];
nritems = btrfs_header_nritems(l);
mid = (nritems + 1)/ 2;
- right = btrfs_alloc_free_block(trans, root,
- extent_buffer_blocknr(l), 0);
+ right = btrfs_alloc_free_block(trans, root, root->leafsize,
+ l->start, 0);
if (IS_ERR(right))
return PTR_ERR(right);
memset_extent_buffer(right, 0, 0, sizeof(struct btrfs_header));
- btrfs_set_header_blocknr(right, extent_buffer_blocknr(right));
+ btrfs_set_header_bytenr(right, right->start);
btrfs_set_header_generation(right, trans->transid);
btrfs_set_header_owner(right, root->root_key.objectid);
btrfs_set_header_level(right, 0);
write_extent_buffer(right, root->fs_info->fsid,
(unsigned long)btrfs_header_fsid(right),
BTRFS_FSID_SIZE);
-
if (mid <= slot) {
if (nritems == 1 ||
leaf_space_used(l, mid, nritems - mid) + space_needed >
btrfs_cpu_key_to_disk(&disk_key, ins_key);
btrfs_set_header_nritems(right, 0);
wret = insert_ptr(trans, root, path,
- &disk_key,
- extent_buffer_blocknr(right),
+ &disk_key, right->start,
path->slots[1] + 1, 1);
if (wret)
ret = wret;
return ret;
}
mid = slot;
- double_split = 1;
+ if (mid != nritems &&
+ leaf_space_used(l, mid, nritems - mid) +
+ space_needed > BTRFS_LEAF_DATA_SIZE(root)) {
+ double_split = 1;
+ }
}
} else {
if (leaf_space_used(l, 0, mid + 1) + space_needed >
BTRFS_LEAF_DATA_SIZE(root)) {
- if (slot == 0) {
+ if (!extend && slot == 0) {
btrfs_cpu_key_to_disk(&disk_key, ins_key);
btrfs_set_header_nritems(right, 0);
wret = insert_ptr(trans, root, path,
&disk_key,
- extent_buffer_blocknr(right),
+ right->start,
path->slots[1], 1);
if (wret)
ret = wret;
ret = wret;
}
return ret;
+ } else if (extend && slot == 0) {
+ mid = 1;
+ } else {
+ mid = slot;
+ if (mid != nritems &&
+ leaf_space_used(l, mid, nritems - mid) +
+ space_needed > BTRFS_LEAF_DATA_SIZE(root)) {
+ double_split = 1;
+ }
}
- mid = slot;
- double_split = 1;
}
}
nritems = nritems - mid;
for (i = 0; i < nritems; i++) {
struct btrfs_item *item = btrfs_item_nr(right, i);
- u32 ioff = btrfs_item_offset(right, item);
+ u32 ioff;
+
+ if (!right->map_token) {
+ map_extent_buffer(right, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &right->map_token, &right->kaddr,
+ &right->map_start, &right->map_len,
+ KM_USER1);
+ }
+
+ ioff = btrfs_item_offset(right, item);
btrfs_set_item_offset(right, item, ioff + rt_data_off);
}
+ if (right->map_token) {
+ unmap_extent_buffer(right, right->map_token, KM_USER1);
+ right->map_token = NULL;
+ }
+
btrfs_set_header_nritems(l, mid);
ret = 0;
btrfs_item_key(right, &disk_key, 0);
- wret = insert_ptr(trans, root, path, &disk_key,
- extent_buffer_blocknr(right), path->slots[1] + 1, 1);
+ wret = insert_ptr(trans, root, path, &disk_key, right->start,
+ path->slots[1] + 1, 1);
if (wret)
ret = wret;
free_extent_buffer(right);
BUG_ON(path->slots[0] < 0);
- check_node(root, path, 1);
- check_leaf(root, path, 0);
-
- if (!double_split)
- return ret;
-
- right = btrfs_alloc_free_block(trans, root,
- extent_buffer_blocknr(l), 0);
- if (IS_ERR(right))
- return PTR_ERR(right);
- memset_extent_buffer(right, 0, 0, sizeof(struct btrfs_header));
- btrfs_set_header_blocknr(right, extent_buffer_blocknr(right));
- btrfs_set_header_generation(right, trans->transid);
- btrfs_set_header_owner(right, root->root_key.objectid);
- btrfs_set_header_level(right, 0);
- write_extent_buffer(right, root->fs_info->fsid,
- (unsigned long)btrfs_header_fsid(right),
- BTRFS_FSID_SIZE);
-
- btrfs_cpu_key_to_disk(&disk_key, ins_key);
- btrfs_set_header_nritems(right, 0);
- wret = insert_ptr(trans, root, path,
- &disk_key,
- extent_buffer_blocknr(right),
- path->slots[1], 1);
- if (wret)
- ret = wret;
- if (path->slots[1] == 0) {
- wret = fixup_low_keys(trans, root, path, &disk_key, 1);
- if (wret)
- ret = wret;
+ if (double_split) {
+ BUG_ON(num_doubles != 0);
+ num_doubles++;
+ goto again;
}
- free_extent_buffer(path->nodes[0]);
- path->nodes[0] = right;
- path->slots[0] = 0;
- check_node(root, path, 1);
- check_leaf(root, path, 0);
return ret;
}
int btrfs_truncate_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_path *path,
- u32 new_size)
+ u32 new_size, int from_end)
{
int ret = 0;
int slot;
slot_orig = path->slots[0];
leaf = path->nodes[0];
+ slot = path->slots[0];
+
+ old_size = btrfs_item_size_nr(leaf, slot);
+ if (old_size == new_size)
+ return 0;
nritems = btrfs_header_nritems(leaf);
data_end = leaf_data_end(root, leaf);
- slot = path->slots[0];
old_data_start = btrfs_item_offset_nr(leaf, slot);
- old_size = btrfs_item_size_nr(leaf, slot);
- BUG_ON(old_size <= new_size);
+
size_diff = old_size - new_size;
BUG_ON(slot < 0);
for (i = slot; i < nritems; i++) {
u32 ioff;
item = btrfs_item_nr(leaf, i);
+
+ if (!leaf->map_token) {
+ map_extent_buffer(leaf, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &leaf->map_token, &leaf->kaddr,
+ &leaf->map_start, &leaf->map_len,
+ KM_USER1);
+ }
+
ioff = btrfs_item_offset(leaf, item);
btrfs_set_item_offset(leaf, item, ioff + size_diff);
}
+
+ if (leaf->map_token) {
+ unmap_extent_buffer(leaf, leaf->map_token, KM_USER1);
+ leaf->map_token = NULL;
+ }
+
/* shift the data */
- memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
- data_end + size_diff, btrfs_leaf_data(leaf) +
- data_end, old_data_start + new_size - data_end);
+ if (from_end) {
+ memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
+ data_end + size_diff, btrfs_leaf_data(leaf) +
+ data_end, old_data_start + new_size - data_end);
+ } else {
+ struct btrfs_disk_key disk_key;
+ u64 offset;
+
+ btrfs_item_key(leaf, &disk_key, slot);
+
+ if (btrfs_disk_key_type(&disk_key) == BTRFS_EXTENT_DATA_KEY) {
+ unsigned long ptr;
+ struct btrfs_file_extent_item *fi;
+
+ fi = btrfs_item_ptr(leaf, slot,
+ struct btrfs_file_extent_item);
+ fi = (struct btrfs_file_extent_item *)(
+ (unsigned long)fi - size_diff);
+
+ if (btrfs_file_extent_type(leaf, fi) ==
+ BTRFS_FILE_EXTENT_INLINE) {
+ ptr = btrfs_item_ptr_offset(leaf, slot);
+ memmove_extent_buffer(leaf, ptr,
+ (unsigned long)fi,
+ offsetof(struct btrfs_file_extent_item,
+ disk_bytenr));
+ }
+ }
+
+ memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
+ data_end + size_diff, btrfs_leaf_data(leaf) +
+ data_end, old_data_start - data_end);
+
+ offset = btrfs_disk_key_offset(&disk_key);
+ btrfs_set_disk_key_offset(&disk_key, offset + size_diff);
+ btrfs_set_item_key(leaf, &disk_key, slot);
+ if (slot == 0)
+ fixup_low_keys(trans, root, path, &disk_key, 1);
+ }
item = btrfs_item_nr(leaf, slot);
btrfs_set_item_size(leaf, item, new_size);
btrfs_print_leaf(root, leaf);
BUG();
}
- check_leaf(root, path, 0);
return ret;
}
old_data = btrfs_item_end_nr(leaf, slot);
BUG_ON(slot < 0);
- BUG_ON(slot >= nritems);
+ if (slot >= nritems) {
+ btrfs_print_leaf(root, leaf);
+ printk("slot %d too large, nritems %d\n", slot, nritems);
+ BUG_ON(1);
+ }
/*
* item0..itemN ... dataN.offset..dataN.size .. data0.size
for (i = slot; i < nritems; i++) {
u32 ioff;
item = btrfs_item_nr(leaf, i);
+
+ if (!leaf->map_token) {
+ map_extent_buffer(leaf, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &leaf->map_token, &leaf->kaddr,
+ &leaf->map_start, &leaf->map_len,
+ KM_USER1);
+ }
ioff = btrfs_item_offset(leaf, item);
btrfs_set_item_offset(leaf, item, ioff - data_size);
}
+ if (leaf->map_token) {
+ unmap_extent_buffer(leaf, leaf->map_token, KM_USER1);
+ leaf->map_token = NULL;
+ }
+
/* shift the data */
memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
data_end - data_size, btrfs_leaf_data(leaf) +
btrfs_print_leaf(root, leaf);
BUG();
}
- check_leaf(root, path, 0);
return ret;
}
if (btrfs_leaf_free_space(root, leaf) <
sizeof(struct btrfs_item) + data_size) {
+ btrfs_print_leaf(root, leaf);
+ printk("not enough freespace need %u have %d\n",
+ data_size, btrfs_leaf_free_space(root, leaf));
BUG();
}
* item0..itemN ... dataN.offset..dataN.size .. data0.size
*/
/* first correct the data pointers */
+ WARN_ON(leaf->map_token);
for (i = slot; i < nritems; i++) {
u32 ioff;
+
item = btrfs_item_nr(leaf, i);
+ if (!leaf->map_token) {
+ map_extent_buffer(leaf, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &leaf->map_token, &leaf->kaddr,
+ &leaf->map_start, &leaf->map_len,
+ KM_USER1);
+ }
+
ioff = btrfs_item_offset(leaf, item);
btrfs_set_item_offset(leaf, item, ioff - data_size);
}
+ if (leaf->map_token) {
+ unmap_extent_buffer(leaf, leaf->map_token, KM_USER1);
+ leaf->map_token = NULL;
+ }
/* shift the items */
memmove_extent_buffer(leaf, btrfs_item_nr_offset(slot + 1),
btrfs_print_leaf(root, leaf);
BUG();
}
- check_leaf(root, path, 0);
out:
return ret;
}
for (i = slot + 1; i < nritems; i++) {
u32 ioff;
+
item = btrfs_item_nr(leaf, i);
+ if (!leaf->map_token) {
+ map_extent_buffer(leaf, (unsigned long)item,
+ sizeof(struct btrfs_item),
+ &leaf->map_token, &leaf->kaddr,
+ &leaf->map_start, &leaf->map_len,
+ KM_USER1);
+ }
ioff = btrfs_item_offset(leaf, item);
btrfs_set_item_offset(leaf, item, ioff + dsize);
}
+
+ if (leaf->map_token) {
+ unmap_extent_buffer(leaf, leaf->map_token, KM_USER1);
+ leaf->map_token = NULL;
+ }
+
memmove_extent_buffer(leaf, btrfs_item_nr_offset(slot),
btrfs_item_nr_offset(slot + 1),
sizeof(struct btrfs_item) *
if (wret)
ret = wret;
wret = btrfs_free_extent(trans, root,
- extent_buffer_blocknr(leaf),
- 1, 1);
+ leaf->start, leaf->len, 1);
if (wret)
ret = wret;
}
slot = path->slots[1];
extent_buffer_get(leaf);
- wret = push_leaf_left(trans, root, path, 1);
+ wret = push_leaf_right(trans, root, path, 1, 1);
if (wret < 0 && wret != -ENOSPC)
ret = wret;
if (path->nodes[0] == leaf &&
btrfs_header_nritems(leaf)) {
- wret = push_leaf_right(trans, root, path, 1);
+ wret = push_leaf_left(trans, root, path, 1, 1);
if (wret < 0 && wret != -ENOSPC)
ret = wret;
}
if (btrfs_header_nritems(leaf) == 0) {
- u64 blocknr = extent_buffer_blocknr(leaf);
+ u64 bytenr = leaf->start;
+ u32 blocksize = leaf->len;
clean_tree_block(trans, root, leaf);
wait_on_tree_block_writeback(root, leaf);
ret = wret;
free_extent_buffer(leaf);
- wret = btrfs_free_extent(trans, root, blocknr,
- 1, 1);
+ wret = btrfs_free_extent(trans, root, bytenr,
+ blocksize, 1);
if (wret)
ret = wret;
} else {
{
int slot;
int level = 1;
- u64 blocknr;
+ u64 bytenr;
struct extent_buffer *c;
struct extent_buffer *next = NULL;
continue;
}
- blocknr = btrfs_node_blockptr(c, slot);
+ bytenr = btrfs_node_blockptr(c, slot);
if (next)
free_extent_buffer(next);
if (path->reada)
reada_for_search(root, path, level, slot);
- next = read_tree_block(root, blocknr);
+ next = read_tree_block(root, bytenr,
+ btrfs_level_size(root, level -1));
break;
}
path->slots[level] = slot;
break;
if (path->reada)
reada_for_search(root, path, level, 0);
- next = read_tree_block(root, btrfs_node_blockptr(next, 0));
+ next = read_tree_block(root, btrfs_node_blockptr(next, 0),
+ btrfs_level_size(root, level - 1));
}
return 0;
}
projects / linux-2.6-block.git / blobdiff