Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 128411
b: refs/heads/master
c: 54aa1f4
h: refs/heads/master
i:
  128409: 87a89b5
  128407: b43c9d1
v: v3
  • Loading branch information
Chris Mason authored and David Woodhouse committed Jun 22, 2007
1 parent f07b642 commit 1b30ad1
Show file tree
Hide file tree
Showing 12 changed files with 411 additions and 216 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 11bd143fc8243cf48c934dc1c4479a5aacf58ce3
refs/heads/master: 54aa1f4dfdacd60a19c4471220b24e581be6f774
106 changes: 82 additions & 24 deletions trunk/fs/btrfs/ctree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,26 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root
{
struct buffer_head *cow;
struct btrfs_node *cow_node;
int ret;

if (btrfs_header_generation(btrfs_buffer_header(buf)) ==
trans->transid) {
*cow_ret = buf;
return 0;
}
cow = btrfs_alloc_free_block(trans, root, buf->b_blocknr);
if (IS_ERR(cow))
return PTR_ERR(cow);
cow_node = btrfs_buffer_node(cow);
if (buf->b_size != root->blocksize || cow->b_size != root->blocksize)
WARN_ON(1);
memcpy(cow_node, btrfs_buffer_node(buf), root->blocksize);
btrfs_set_header_blocknr(&cow_node->header, bh_blocknr(cow));
btrfs_set_header_generation(&cow_node->header, trans->transid);
btrfs_set_header_owner(&cow_node->header, root->root_key.objectid);
btrfs_inc_ref(trans, root, buf);
ret = btrfs_inc_ref(trans, root, buf);
if (ret)
return ret;
if (buf == root->node) {
root->node = cow;
get_bh(cow);
Expand Down Expand Up @@ -320,6 +325,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
int wret;
int pslot;
int orig_slot = path->slots[level];
int err_on_enospc = 0;
u64 orig_ptr;

if (level == 0)
Expand Down Expand Up @@ -363,29 +369,43 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
BTRFS_NODEPTRS_PER_BLOCK(root) / 4)
return 0;

if (btrfs_header_nritems(&mid->header) < 2)
err_on_enospc = 1;

left_buf = read_node_slot(root, parent_buf, pslot - 1);
right_buf = read_node_slot(root, parent_buf, pslot + 1);

/* first, try to make some room in the middle buffer */
if (left_buf) {
btrfs_cow_block(trans, root, left_buf, parent_buf, pslot - 1,
&left_buf);
wret = btrfs_cow_block(trans, root, left_buf,
parent_buf, pslot - 1, &left_buf);
if (wret) {
ret = wret;
goto enospc;
}
left = btrfs_buffer_node(left_buf);
orig_slot += btrfs_header_nritems(&left->header);
wret = push_node_left(trans, root, left_buf, mid_buf);
if (wret < 0)
ret = wret;
if (btrfs_header_nritems(&mid->header) < 2)
err_on_enospc = 1;
}

/*
* then try to empty the right most buffer into the middle
*/
if (right_buf) {
btrfs_cow_block(trans, root, right_buf, parent_buf, pslot + 1,
&right_buf);
wret = btrfs_cow_block(trans, root, right_buf,
parent_buf, pslot + 1, &right_buf);
if (wret) {
ret = wret;
goto enospc;
}

right = btrfs_buffer_node(right_buf);
wret = push_node_left(trans, root, mid_buf, right_buf);
if (wret < 0)
if (wret < 0 && wret != -ENOSPC)
ret = wret;
if (btrfs_header_nritems(&right->header) == 0) {
u64 blocknr = bh_blocknr(right_buf);
Expand Down Expand Up @@ -421,8 +441,10 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
*/
BUG_ON(!left_buf);
wret = balance_node_right(trans, root, mid_buf, left_buf);
if (wret < 0)
if (wret < 0) {
ret = wret;
goto enospc;
}
BUG_ON(wret == 1);
}
if (btrfs_header_nritems(&mid->header) == 0) {
Expand Down Expand Up @@ -467,7 +489,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_node_blockptr(btrfs_buffer_node(path->nodes[level]),
path->slots[level]))
BUG();

enospc:
if (right_buf)
btrfs_block_release(root, right_buf);
if (left_buf)
Expand Down Expand Up @@ -519,10 +541,15 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans,
if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
wret = 1;
} else {
btrfs_cow_block(trans, root, left_buf, parent_buf,
pslot - 1, &left_buf);
left = btrfs_buffer_node(left_buf);
wret = push_node_left(trans, root, left_buf, mid_buf);
ret = btrfs_cow_block(trans, root, left_buf, parent_buf,
pslot - 1, &left_buf);
if (ret)
wret = 1;
else {
left = btrfs_buffer_node(left_buf);
wret = push_node_left(trans, root,
left_buf, mid_buf);
}
}
if (wret < 0)
ret = wret;
Expand Down Expand Up @@ -561,11 +588,16 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans,
if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
wret = 1;
} else {
btrfs_cow_block(trans, root, right_buf,
parent_buf, pslot + 1, &right_buf);
right = btrfs_buffer_node(right_buf);
wret = balance_node_right(trans, root,
right_buf, mid_buf);
ret = btrfs_cow_block(trans, root, right_buf,
parent_buf, pslot + 1,
&right_buf);
if (ret)
wret = 1;
else {
right = btrfs_buffer_node(right_buf);
wret = balance_node_right(trans, root,
right_buf, mid_buf);
}
}
if (wret < 0)
ret = wret;
Expand Down Expand Up @@ -631,6 +663,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
p->nodes[level + 1],
p->slots[level + 1],
&cow_buf);
if (wret) {
btrfs_block_release(root, cow_buf);
return wret;
}
b = cow_buf;
c = btrfs_buffer_node(b);
}
Expand Down Expand Up @@ -737,6 +773,7 @@ static int push_node_left(struct btrfs_trans_handle *trans, struct btrfs_root
src_nritems = btrfs_header_nritems(&src->header);
dst_nritems = btrfs_header_nritems(&dst->header);
push_items = BTRFS_NODEPTRS_PER_BLOCK(root) - dst_nritems;

if (push_items <= 0) {
return 1;
}
Expand Down Expand Up @@ -827,6 +864,8 @@ static int insert_new_root(struct btrfs_trans_handle *trans, struct btrfs_root
BUG_ON(path->nodes[level-1] != root->node);

t = btrfs_alloc_free_block(trans, root, root->node->b_blocknr);
if (IS_ERR(t))
return PTR_ERR(t);
c = btrfs_buffer_node(t);
memset(c, 0, root->blocksize);
btrfs_set_header_nritems(&c->header, 1);
Expand Down Expand Up @@ -929,10 +968,15 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_header_nritems(&c->header) <
BTRFS_NODEPTRS_PER_BLOCK(root) - 1)
return 0;
if (ret < 0)
return ret;
}

c_nritems = btrfs_header_nritems(&c->header);
split_buffer = btrfs_alloc_free_block(trans, root, t->b_blocknr);
if (IS_ERR(split_buffer))
return PTR_ERR(split_buffer);

split = btrfs_buffer_node(split_buffer);
btrfs_set_header_flags(&split->header, btrfs_header_flags(&c->header));
btrfs_set_header_level(&split->header, btrfs_header_level(&c->header));
Expand Down Expand Up @@ -1022,6 +1066,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
struct btrfs_item *item;
u32 left_nritems;
u32 right_nritems;
int ret;

slot = path->slots[1];
if (!path->nodes[1]) {
Expand All @@ -1041,7 +1086,12 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
return 1;
}
/* cow and double check */
btrfs_cow_block(trans, root, right_buf, upper, slot + 1, &right_buf);
ret = btrfs_cow_block(trans, root, right_buf, upper,
slot + 1, &right_buf);
if (ret) {
btrfs_block_release(root, right_buf);
return 1;
}
right = btrfs_buffer_leaf(right_buf);
free_space = btrfs_leaf_free_space(root, right);
if (free_space < data_size + sizeof(struct btrfs_item)) {
Expand Down Expand Up @@ -1162,7 +1212,11 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
}

/* cow and double check */
btrfs_cow_block(trans, root, t, path->nodes[1], slot - 1, &t);
ret = btrfs_cow_block(trans, root, t, path->nodes[1], slot - 1, &t);
if (ret) {
/* we hit -ENOSPC, but it isn't fatal here */
return 1;
}
left = btrfs_buffer_leaf(t);
free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) {
Expand Down Expand Up @@ -1309,8 +1363,11 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
slot = path->slots[0];
nritems = btrfs_header_nritems(&l->header);
mid = (nritems + 1)/ 2;

right_buffer = btrfs_alloc_free_block(trans, root, l_buf->b_blocknr);
BUG_ON(!right_buffer);
if (IS_ERR(right_buffer))
return PTR_ERR(right_buffer);

right = btrfs_buffer_leaf(right_buffer);
memset(&right->header, 0, sizeof(right->header));
btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
Expand Down Expand Up @@ -1407,7 +1464,9 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
if (!double_split)
return ret;
right_buffer = btrfs_alloc_free_block(trans, root, l_buf->b_blocknr);
BUG_ON(!right_buffer);
if (IS_ERR(right_buffer))
return PTR_ERR(right_buffer);

right = btrfs_buffer_leaf(right_buffer);
memset(&right->header, 0, sizeof(right->header));
btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
Expand Down Expand Up @@ -1655,7 +1714,6 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root
ptr, data, data_size);
btrfs_mark_buffer_dirty(path->nodes[0]);
}
btrfs_release_path(root, path);
btrfs_free_path(path);
return ret;
}
Expand Down Expand Up @@ -1775,12 +1833,12 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
slot = path->slots[1];
get_bh(leaf_buf);
wret = push_leaf_left(trans, root, path, 1);
if (wret < 0)
if (wret < 0 && wret != -ENOSPC)
ret = wret;
if (path->nodes[0] == leaf_buf &&
btrfs_header_nritems(&leaf->header)) {
wret = push_leaf_right(trans, root, path, 1);
if (wret < 0)
if (wret < 0 && wret != -ENOSPC)
ret = wret;
}
if (btrfs_header_nritems(&leaf->header) == 0) {
Expand Down
3 changes: 0 additions & 3 deletions trunk/fs/btrfs/ctree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,6 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
u64 objectid, u64 offset,
char *data, size_t len);
int btrfs_csum_verify_file_block(struct btrfs_root *root,
u64 objectid, u64 offset,
char *data, size_t len);
struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_path *path,
Expand Down
6 changes: 3 additions & 3 deletions trunk/fs/btrfs/dir-item.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
if (ret)
return ERR_PTR(ret);
}
if (ret < 0)
return ERR_PTR(ret);
WARN_ON(ret > 0);
leaf = btrfs_buffer_leaf(path->nodes[0]);
item = leaf->items + path->slots[0];
Expand Down Expand Up @@ -225,22 +227,20 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
struct btrfs_leaf *leaf;
u32 sub_item_len;
u32 item_len;
int ret;
int ret = 0;

leaf = btrfs_buffer_leaf(path->nodes[0]);
sub_item_len = sizeof(*di) + btrfs_dir_name_len(di);
item_len = btrfs_item_size(leaf->items + path->slots[0]);
if (sub_item_len == btrfs_item_size(leaf->items + path->slots[0])) {
ret = btrfs_del_item(trans, root, path);
BUG_ON(ret);
} else {
char *ptr = (char *)di;
char *start = btrfs_item_ptr(leaf, path->slots[0], char);
btrfs_memmove(root, leaf, ptr, ptr + sub_item_len,
item_len - (ptr + sub_item_len - start));
ret = btrfs_truncate_item(trans, root, path,
item_len - sub_item_len);
BUG_ON(ret);
}
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/btrfs/disk-io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ int close_ctree(struct btrfs_root *root)
btrfs_transaction_flush_work(root);
mutex_lock(&fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1);
btrfs_commit_transaction(trans, root);
ret = btrfs_commit_transaction(trans, root);
/* run commit again to drop the original snapshot */
trans = btrfs_start_transaction(root, 1);
btrfs_commit_transaction(trans, root);
Expand Down
Loading

0 comments on commit 1b30ad1

Please sign in to comment.