Skip to content

L
linux
Commit 54aa1f4d authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse
Browse files
Options

Btrfs: Audit callers and return codes to make sure -ENOSPC gets up the stack 

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 11bd143f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 215 deletions
fs/btrfs/ctree.c
View file @ 54aa1f4d
...@@ -73,6 +73,7 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -73,6 +73,7 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root
{ {
struct buffer_head *cow; struct buffer_head *cow;
struct btrfs_node *cow_node; struct btrfs_node *cow_node;
int ret;
if (btrfs_header_generation(btrfs_buffer_header(buf)) == if (btrfs_header_generation(btrfs_buffer_header(buf)) ==
trans->transid) { trans->transid) {
...@@ -80,6 +81,8 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -80,6 +81,8 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root
return 0; return 0;
} }
cow = btrfs_alloc_free_block(trans, root, buf->b_blocknr); cow = btrfs_alloc_free_block(trans, root, buf->b_blocknr);
if (IS_ERR(cow))
return PTR_ERR(cow);
cow_node = btrfs_buffer_node(cow); cow_node = btrfs_buffer_node(cow);
if (buf->b_size != root->blocksize || cow->b_size != root->blocksize) if (buf->b_size != root->blocksize || cow->b_size != root->blocksize)
WARN_ON(1); WARN_ON(1);
...@@ -87,7 +90,9 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -87,7 +90,9 @@ static int btrfs_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_header_blocknr(&cow_node->header, bh_blocknr(cow)); btrfs_set_header_blocknr(&cow_node->header, bh_blocknr(cow));
btrfs_set_header_generation(&cow_node->header, trans->transid); btrfs_set_header_generation(&cow_node->header, trans->transid);
btrfs_set_header_owner(&cow_node->header, root->root_key.objectid); 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) { if (buf == root->node) {
root->node = cow; root->node = cow;
get_bh(cow); get_bh(cow);
...@@ -320,6 +325,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -320,6 +325,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
int wret; int wret;
int pslot; int pslot;
int orig_slot = path->slots[level]; int orig_slot = path->slots[level];
int err_on_enospc = 0;
u64 orig_ptr; u64 orig_ptr;
if (level == 0) if (level == 0)
...@@ -363,29 +369,43 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -363,29 +369,43 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
BTRFS_NODEPTRS_PER_BLOCK(root) / 4) BTRFS_NODEPTRS_PER_BLOCK(root) / 4)
return 0; return 0;
if (btrfs_header_nritems(&mid->header) < 2)
err_on_enospc = 1;
left_buf = read_node_slot(root, parent_buf, pslot - 1); left_buf = read_node_slot(root, parent_buf, pslot - 1);
right_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 */ /* first, try to make some room in the middle buffer */
if (left_buf) { if (left_buf) {
btrfs_cow_block(trans, root, left_buf, parent_buf, pslot - 1, wret = btrfs_cow_block(trans, root, left_buf,
&left_buf); parent_buf, pslot - 1, &left_buf);
if (wret) {
ret = wret;
goto enospc;
}
left = btrfs_buffer_node(left_buf); left = btrfs_buffer_node(left_buf);
orig_slot += btrfs_header_nritems(&left->header); orig_slot += btrfs_header_nritems(&left->header);
wret = push_node_left(trans, root, left_buf, mid_buf); wret = push_node_left(trans, root, left_buf, mid_buf);
if (wret < 0) if (wret < 0)
ret = wret; ret = wret;
if (btrfs_header_nritems(&mid->header) < 2)
err_on_enospc = 1;
} }
/* /*
* then try to empty the right most buffer into the middle * then try to empty the right most buffer into the middle
*/ */
if (right_buf) { if (right_buf) {
btrfs_cow_block(trans, root, right_buf, parent_buf, pslot + 1, wret = btrfs_cow_block(trans, root, right_buf,
&right_buf); parent_buf, pslot + 1, &right_buf);
if (wret) {
ret = wret;
goto enospc;
}
right = btrfs_buffer_node(right_buf); right = btrfs_buffer_node(right_buf);
wret = push_node_left(trans, root, mid_buf, right_buf); wret = push_node_left(trans, root, mid_buf, right_buf);
if (wret < 0) if (wret < 0 && wret != -ENOSPC)
ret = wret; ret = wret;
if (btrfs_header_nritems(&right->header) == 0) { if (btrfs_header_nritems(&right->header) == 0) {
u64 blocknr = bh_blocknr(right_buf); u64 blocknr = bh_blocknr(right_buf);
...@@ -421,8 +441,10 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -421,8 +441,10 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root
*/ */
BUG_ON(!left_buf); BUG_ON(!left_buf);
wret = balance_node_right(trans, root, mid_buf, left_buf); wret = balance_node_right(trans, root, mid_buf, left_buf);
if (wret < 0) if (wret < 0) {
ret = wret; ret = wret;
goto enospc;
}
BUG_ON(wret == 1); BUG_ON(wret == 1);
} }
if (btrfs_header_nritems(&mid->header) == 0) { if (btrfs_header_nritems(&mid->header) == 0) {
...@@ -467,7 +489,7 @@ static int balance_level(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -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]), btrfs_node_blockptr(btrfs_buffer_node(path->nodes[level]),
path->slots[level])) path->slots[level]))
BUG(); BUG();
enospc:
if (right_buf) if (right_buf)
btrfs_block_release(root, right_buf); btrfs_block_release(root, right_buf);
if (left_buf) if (left_buf)
...@@ -519,10 +541,15 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans, ...@@ -519,10 +541,15 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans,
if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) { if (left_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
wret = 1; wret = 1;
} else { } else {
btrfs_cow_block(trans, root, left_buf, parent_buf, ret = btrfs_cow_block(trans, root, left_buf, parent_buf,
pslot - 1, &left_buf); pslot - 1, &left_buf);
if (ret)
wret = 1;
else {
left = btrfs_buffer_node(left_buf); left = btrfs_buffer_node(left_buf);
wret = push_node_left(trans, root, left_buf, mid_buf); wret = push_node_left(trans, root,
left_buf, mid_buf);
}
} }
if (wret < 0) if (wret < 0)
ret = wret; ret = wret;
...@@ -561,12 +588,17 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans, ...@@ -561,12 +588,17 @@ static int push_nodes_for_insert(struct btrfs_trans_handle *trans,
if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) { if (right_nr >= BTRFS_NODEPTRS_PER_BLOCK(root) - 1) {
wret = 1; wret = 1;
} else { } else {
btrfs_cow_block(trans, root, right_buf, ret = btrfs_cow_block(trans, root, right_buf,
parent_buf, pslot + 1, &right_buf); parent_buf, pslot + 1,
&right_buf);
if (ret)
wret = 1;
else {
right = btrfs_buffer_node(right_buf); right = btrfs_buffer_node(right_buf);
wret = balance_node_right(trans, root, wret = balance_node_right(trans, root,
right_buf, mid_buf); right_buf, mid_buf);
} }
}
if (wret < 0) if (wret < 0)
ret = wret; ret = wret;
if (wret == 0) { if (wret == 0) {
...@@ -631,6 +663,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -631,6 +663,10 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root
p->nodes[level + 1], p->nodes[level + 1],
p->slots[level + 1], p->slots[level + 1],
&cow_buf); &cow_buf);
if (wret) {
btrfs_block_release(root, cow_buf);
return wret;
}
b = cow_buf; b = cow_buf;
c = btrfs_buffer_node(b); c = btrfs_buffer_node(b);
} }
...@@ -737,6 +773,7 @@ static int push_node_left(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -737,6 +773,7 @@ static int push_node_left(struct btrfs_trans_handle *trans, struct btrfs_root
src_nritems = btrfs_header_nritems(&src->header); src_nritems = btrfs_header_nritems(&src->header);
dst_nritems = btrfs_header_nritems(&dst->header); dst_nritems = btrfs_header_nritems(&dst->header);
push_items = BTRFS_NODEPTRS_PER_BLOCK(root) - dst_nritems; push_items = BTRFS_NODEPTRS_PER_BLOCK(root) - dst_nritems;
if (push_items <= 0) { if (push_items <= 0) {
return 1; return 1;
} }
...@@ -827,6 +864,8 @@ static int insert_new_root(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -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); BUG_ON(path->nodes[level-1] != root->node);
t = btrfs_alloc_free_block(trans, root, root->node->b_blocknr); t = btrfs_alloc_free_block(trans, root, root->node->b_blocknr);
if (IS_ERR(t))
return PTR_ERR(t);
c = btrfs_buffer_node(t); c = btrfs_buffer_node(t);
memset(c, 0, root->blocksize); memset(c, 0, root->blocksize);
btrfs_set_header_nritems(&c->header, 1); btrfs_set_header_nritems(&c->header, 1);
...@@ -929,10 +968,15 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -929,10 +968,15 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_header_nritems(&c->header) < btrfs_header_nritems(&c->header) <
BTRFS_NODEPTRS_PER_BLOCK(root) - 1) BTRFS_NODEPTRS_PER_BLOCK(root) - 1)
return 0; return 0;
if (ret < 0)
return ret;
} }
c_nritems = btrfs_header_nritems(&c->header); c_nritems = btrfs_header_nritems(&c->header);
split_buffer = btrfs_alloc_free_block(trans, root, t->b_blocknr); 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); split = btrfs_buffer_node(split_buffer);
btrfs_set_header_flags(&split->header, btrfs_header_flags(&c->header)); btrfs_set_header_flags(&split->header, btrfs_header_flags(&c->header));
btrfs_set_header_level(&split->header, btrfs_header_level(&c->header)); btrfs_set_header_level(&split->header, btrfs_header_level(&c->header));
...@@ -1022,6 +1066,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1022,6 +1066,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
struct btrfs_item *item; struct btrfs_item *item;
u32 left_nritems; u32 left_nritems;
u32 right_nritems; u32 right_nritems;
int ret;
slot = path->slots[1]; slot = path->slots[1];
if (!path->nodes[1]) { if (!path->nodes[1]) {
...@@ -1041,7 +1086,12 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1041,7 +1086,12 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
return 1; return 1;
} }
/* cow and double check */ /* 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); right = btrfs_buffer_leaf(right_buf);
free_space = btrfs_leaf_free_space(root, right); free_space = btrfs_leaf_free_space(root, right);
if (free_space < data_size + sizeof(struct btrfs_item)) { if (free_space < data_size + sizeof(struct btrfs_item)) {
...@@ -1162,7 +1212,11 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1162,7 +1212,11 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
} }
/* cow and double check */ /* 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); left = btrfs_buffer_leaf(t);
free_space = btrfs_leaf_free_space(root, left); free_space = btrfs_leaf_free_space(root, left);
if (free_space < data_size + sizeof(struct btrfs_item)) { if (free_space < data_size + sizeof(struct btrfs_item)) {
...@@ -1309,8 +1363,11 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1309,8 +1363,11 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
slot = path->slots[0]; slot = path->slots[0];
nritems = btrfs_header_nritems(&l->header); nritems = btrfs_header_nritems(&l->header);
mid = (nritems + 1)/ 2; mid = (nritems + 1)/ 2;
right_buffer = btrfs_alloc_free_block(trans, root, l_buf->b_blocknr); 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); right = btrfs_buffer_leaf(right_buffer);
memset(&right->header, 0, sizeof(right->header)); memset(&right->header, 0, sizeof(right->header));
btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer)); btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
...@@ -1407,7 +1464,9 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1407,7 +1464,9 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
if (!double_split) if (!double_split)
return ret; return ret;
right_buffer = btrfs_alloc_free_block(trans, root, l_buf->b_blocknr); 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); right = btrfs_buffer_leaf(right_buffer);
memset(&right->header, 0, sizeof(right->header)); memset(&right->header, 0, sizeof(right->header));
btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer)); btrfs_set_header_blocknr(&right->header, bh_blocknr(right_buffer));
...@@ -1655,7 +1714,6 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1655,7 +1714,6 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root
ptr, data, data_size); ptr, data, data_size);
btrfs_mark_buffer_dirty(path->nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
} }
btrfs_release_path(root, path);
btrfs_free_path(path); btrfs_free_path(path);
return ret; return ret;
} }
...@@ -1775,12 +1833,12 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, ...@@ -1775,12 +1833,12 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
slot = path->slots[1]; slot = path->slots[1];
get_bh(leaf_buf); get_bh(leaf_buf);
wret = push_leaf_left(trans, root, path, 1); wret = push_leaf_left(trans, root, path, 1);
if (wret < 0) if (wret < 0 && wret != -ENOSPC)
ret = wret; ret = wret;
if (path->nodes[0] == leaf_buf && if (path->nodes[0] == leaf_buf &&
btrfs_header_nritems(&leaf->header)) { btrfs_header_nritems(&leaf->header)) {
wret = push_leaf_right(trans, root, path, 1); wret = push_leaf_right(trans, root, path, 1);
if (wret < 0) if (wret < 0 && wret != -ENOSPC)
ret = wret; ret = wret;
} }
if (btrfs_header_nritems(&leaf->header) == 0) { if (btrfs_header_nritems(&leaf->header) == 0) {
......
fs/btrfs/ctree.h
View file @ 54aa1f4d
...@@ -1126,9 +1126,6 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans, ...@@ -1126,9 +1126,6 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
u64 objectid, u64 offset, u64 objectid, u64 offset,
char *data, size_t len); 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_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
......
fs/btrfs/dir-item.c
View file @ 54aa1f4d
...@@ -47,6 +47,8 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle ...@@ -47,6 +47,8 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
if (ret) if (ret)
return ERR_PTR(ret); return ERR_PTR(ret);
} }
if (ret < 0)
return ERR_PTR(ret);
WARN_ON(ret > 0); WARN_ON(ret > 0);
leaf = btrfs_buffer_leaf(path->nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
item = leaf->items + path->slots[0]; item = leaf->items + path->slots[0];
...@@ -225,14 +227,13 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, ...@@ -225,14 +227,13 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
struct btrfs_leaf *leaf; struct btrfs_leaf *leaf;
u32 sub_item_len; u32 sub_item_len;
u32 item_len; u32 item_len;
int ret; int ret = 0;
leaf = btrfs_buffer_leaf(path->nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
sub_item_len = sizeof(*di) + btrfs_dir_name_len(di); sub_item_len = sizeof(*di) + btrfs_dir_name_len(di);
item_len = btrfs_item_size(leaf->items + path->slots[0]); item_len = btrfs_item_size(leaf->items + path->slots[0]);
if (sub_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); ret = btrfs_del_item(trans, root, path);
BUG_ON(ret);
} else { } else {
char *ptr = (char *)di; char *ptr = (char *)di;
char *start = btrfs_item_ptr(leaf, path->slots[0], char); char *start = btrfs_item_ptr(leaf, path->slots[0], char);
...@@ -240,7 +241,6 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, ...@@ -240,7 +241,6 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
item_len - (ptr + sub_item_len - start)); item_len - (ptr + sub_item_len - start));
ret = btrfs_truncate_item(trans, root, path, ret = btrfs_truncate_item(trans, root, path,
item_len - sub_item_len); item_len - sub_item_len);
BUG_ON(ret);
} }
return 0; return 0;
} }
......
fs/btrfs/disk-io.c
View file @ 54aa1f4d
...@@ -580,7 +580,7 @@ int close_ctree(struct btrfs_root *root) ...@@ -580,7 +580,7 @@ int close_ctree(struct btrfs_root *root)
btrfs_transaction_flush_work(root); btrfs_transaction_flush_work(root);
mutex_lock(&fs_info->fs_mutex); mutex_lock(&fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1); 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 */ /* run commit again to drop the original snapshot */
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
btrfs_commit_transaction(trans, root); btrfs_commit_transaction(trans, root);
......
fs/btrfs/extent-tree.c
View file @ 54aa1f4d
...@@ -100,6 +100,8 @@ static int cache_block_group(struct btrfs_root *root, ...@@ -100,6 +100,8 @@ static int cache_block_group(struct btrfs_root *root,
if (slot >= btrfs_header_nritems(&leaf->header)) { if (slot >= btrfs_header_nritems(&leaf->header)) {
reada_extent_leaves(root, path, limit); reada_extent_leaves(root, path, limit);
ret = btrfs_next_leaf(root, path); ret = btrfs_next_leaf(root, path);
if (ret < 0)
goto err;
if (ret == 0) { if (ret == 0) {
continue; continue;
} else { } else {
...@@ -148,6 +150,7 @@ static int cache_block_group(struct btrfs_root *root, ...@@ -148,6 +150,7 @@ static int cache_block_group(struct btrfs_root *root,
} }
block_group->cached = 1; block_group->cached = 1;
err:
btrfs_free_path(path); btrfs_free_path(path);
return 0; return 0;
} }
...@@ -201,7 +204,9 @@ static u64 find_search_start(struct btrfs_root *root, ...@@ -201,7 +204,9 @@ static u64 find_search_start(struct btrfs_root *root,
last = max(last, cache->last_prealloc); last = max(last, cache->last_prealloc);
} }
again: again:
cache_block_group(root, cache); ret = cache_block_group(root, cache);
if (ret)
goto out;
while(1) { while(1) {
ret = find_first_radix_bit(&root->fs_info->extent_map_radix, ret = find_first_radix_bit(&root->fs_info->extent_map_radix,
gang, last, ARRAY_SIZE(gang)); gang, last, ARRAY_SIZE(gang));
...@@ -398,16 +403,23 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, ...@@ -398,16 +403,23 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
struct btrfs_key ins; struct btrfs_key ins;
u32 refs; u32 refs;
find_free_extent(trans, root->fs_info->extent_root, 0, 0, (u64)-1, 0,
&ins, 0);
path = btrfs_alloc_path(); path = btrfs_alloc_path();
BUG_ON(!path); if (!path)
return -ENOMEM;
ret = find_free_extent(trans, root->fs_info->extent_root, 0, 0,
(u64)-1, 0, &ins, 0);
if (ret) {
btrfs_free_path(path);
return ret;
}
key.objectid = blocknr; key.objectid = blocknr;
key.flags = 0; key.flags = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
key.offset = num_blocks; key.offset = num_blocks;
ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path, ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
0, 1); 0, 1);
if (ret < 0)
return ret;
if (ret != 0) { if (ret != 0) {
BUG(); BUG();
} }
...@@ -442,12 +454,14 @@ static int lookup_extent_ref(struct btrfs_trans_handle *trans, ...@@ -442,12 +454,14 @@ static int lookup_extent_ref(struct btrfs_trans_handle *trans,
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path, ret = btrfs_search_slot(trans, root->fs_info->extent_root, &key, path,
0, 0); 0, 0);
if (ret < 0)
goto out;
if (ret != 0) if (ret != 0)
BUG(); BUG();
l = btrfs_buffer_leaf(path->nodes[0]); l = btrfs_buffer_leaf(path->nodes[0]);
item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item); item = btrfs_item_ptr(l, path->slots[0], struct btrfs_extent_item);
*refs = btrfs_extent_refs(item); *refs = btrfs_extent_refs(item);
btrfs_release_path(root->fs_info->extent_root, path); out:
btrfs_free_path(path); btrfs_free_path(path);
return 0; return 0;
} }
...@@ -469,6 +483,8 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, ...@@ -469,6 +483,8 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
int i; int i;
int leaf; int leaf;
int ret; int ret;
int faili;
int err;
if (!root->ref_cows) if (!root->ref_cows)
return 0; return 0;
...@@ -491,14 +507,45 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, ...@@ -491,14 +507,45 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
continue; continue;
ret = btrfs_inc_extent_ref(trans, root, disk_blocknr, ret = btrfs_inc_extent_ref(trans, root, disk_blocknr,
btrfs_file_extent_disk_num_blocks(fi)); btrfs_file_extent_disk_num_blocks(fi));
BUG_ON(ret); if (ret) {
faili = i;
goto fail;
}
} else { } else {
blocknr = btrfs_node_blockptr(buf_node, i); blocknr = btrfs_node_blockptr(buf_node, i);
ret = btrfs_inc_extent_ref(trans, root, blocknr, 1); ret = btrfs_inc_extent_ref(trans, root, blocknr, 1);
BUG_ON(ret); if (ret) {
faili = i;
goto fail;
}
} }
} }
return 0; return 0;
fail:
for (i =0; i < faili; i++) {
if (leaf) {
u64 disk_blocknr;
key = &buf_leaf->items[i].key;
if (btrfs_disk_key_type(key) != BTRFS_EXTENT_DATA_KEY)
continue;
fi = btrfs_item_ptr(buf_leaf, i,
struct btrfs_file_extent_item);
if (btrfs_file_extent_type(fi) ==
BTRFS_FILE_EXTENT_INLINE)
continue;
disk_blocknr = btrfs_file_extent_disk_blocknr(fi);
if (disk_blocknr == 0)
continue;
err = btrfs_free_extent(trans, root, disk_blocknr,
btrfs_file_extent_disk_num_blocks(fi), 0);
BUG_ON(err);
} else {
blocknr = btrfs_node_blockptr(buf_node, i);
err = btrfs_free_extent(trans, root, blocknr, 1, 0);
BUG_ON(err);
}
}
return ret;
} }
static int write_one_cache_group(struct btrfs_trans_handle *trans, static int write_one_cache_group(struct btrfs_trans_handle *trans,
...@@ -512,15 +559,20 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans, ...@@ -512,15 +559,20 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans,
struct btrfs_block_group_item *bi; struct btrfs_block_group_item *bi;
struct btrfs_key ins; struct btrfs_key ins;
find_free_extent(trans, extent_root, 0, 0, (u64)-1, 0, &ins, 0); ret = find_free_extent(trans, extent_root, 0, 0, (u64)-1, 0, &ins, 0);
/* FIXME, set bit to recalc cache groups on next mount */
if (ret)
return ret;
ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1); ret = btrfs_search_slot(trans, extent_root, &cache->key, path, 0, 1);
if (ret < 0)
goto fail;
BUG_ON(ret); BUG_ON(ret);
bi = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0], bi = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_block_group_item); struct btrfs_block_group_item);
memcpy(bi, &cache->item, sizeof(*bi)); memcpy(bi, &cache->item, sizeof(*bi));
mark_buffer_dirty(path->nodes[0]); mark_buffer_dirty(path->nodes[0]);
btrfs_release_path(extent_root, path); btrfs_release_path(extent_root, path);
fail:
finish_current_insert(trans, extent_root); finish_current_insert(trans, extent_root);
pending_ret = del_pending_extents(trans, extent_root); pending_ret = del_pending_extents(trans, extent_root);
if (ret) if (ret)
...@@ -543,6 +595,7 @@ static int write_dirty_block_radix(struct btrfs_trans_handle *trans, ...@@ -543,6 +595,7 @@ static int write_dirty_block_radix(struct btrfs_trans_handle *trans,
int werr = 0; int werr = 0;
int i; int i;
struct btrfs_path *path; struct btrfs_path *path;
unsigned long off = 0;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path)
...@@ -550,18 +603,28 @@ static int write_dirty_block_radix(struct btrfs_trans_handle *trans, ...@@ -550,18 +603,28 @@ static int write_dirty_block_radix(struct btrfs_trans_handle *trans,
while(1) { while(1) {
ret = radix_tree_gang_lookup_tag(radix, (void **)cache, ret = radix_tree_gang_lookup_tag(radix, (void **)cache,
0, ARRAY_SIZE(cache), off, ARRAY_SIZE(cache),
BTRFS_BLOCK_GROUP_DIRTY); BTRFS_BLOCK_GROUP_DIRTY);
if (!ret) if (!ret)
break; break;
for (i = 0; i < ret; i++) { 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, err = write_one_cache_group(trans, root,
path, cache[i]); path, cache[i]);
if (err) /*
* if we fail to write the cache group, we want
* to keep it marked dirty in hopes that a later
* write will work
*/
if (err) {
werr = err; 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);
} }
} }
btrfs_free_path(path); btrfs_free_path(path);
...@@ -801,14 +864,20 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -801,14 +864,20 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_ITEM_KEY);
key.offset = num_blocks; key.offset = num_blocks;
find_free_extent(trans, root, 0, 0, (u64)-1, 0, &ins, 0);
path = btrfs_alloc_path(); path = btrfs_alloc_path();
BUG_ON(!path); if (!path)
return -ENOMEM;
ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1); ret = find_free_extent(trans, root, 0, 0, (u64)-1, 0, &ins, 0);
if (ret) { if (ret) {
BUG(); btrfs_free_path(path);
return ret;
} }
ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
if (ret < 0)
return ret;
BUG_ON(ret);
ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0], ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_extent_item); struct btrfs_extent_item);
BUG_ON(ei->refs == 0); BUG_ON(ei->refs == 0);
...@@ -827,8 +896,9 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -827,8 +896,9 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_super_blocks_used(info->disk_super, btrfs_set_super_blocks_used(info->disk_super,
super_blocks_used - num_blocks); super_blocks_used - num_blocks);
ret = btrfs_del_item(trans, extent_root, path); ret = btrfs_del_item(trans, extent_root, path);
if (ret) if (ret) {
BUG(); return ret;
}
ret = update_block_group(trans, root, blocknr, num_blocks, 0, ret = update_block_group(trans, root, blocknr, num_blocks, 0,
mark_free, 0); mark_free, 0);
BUG_ON(ret); BUG_ON(ret);
...@@ -1075,7 +1145,6 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -1075,7 +1145,6 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
path->slots[0]++; path->slots[0]++;
cond_resched(); cond_resched();
} }
// FIXME -ENOSPC
check_pending: check_pending:
/* we have to make sure we didn't find an extent that has already /* we have to make sure we didn't find an extent that has already
* been allocated by the map tree or the original allocation * been allocated by the map tree or the original allocation
...@@ -1246,6 +1315,14 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans, ...@@ -1246,6 +1315,14 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
ret = find_free_extent(trans, root, num_blocks, search_start, ret = find_free_extent(trans, root, num_blocks, search_start,
search_end, hint_block, ins, data); search_end, hint_block, ins, data);
if (ret) { if (ret) {
if (search_start == 0)
return ret;
search_end = search_start - 1;
search_start = 0;
hint_block = search_start;
ret = find_free_extent(trans, root, num_blocks, search_start,
search_end, hint_block, ins, data);
if (ret)
return ret; return ret;
} }
...@@ -1271,6 +1348,15 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans, ...@@ -1271,6 +1348,15 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans,
search_end, hint_block, search_end, hint_block,
&prealloc_key, 0); &prealloc_key, 0);
if (ret) { if (ret) {
if (search_start == 0)
return ret;
search_end = search_start - 1;
search_start = 0;
hint_block = search_start;
ret = find_free_extent(trans, root, 0, search_start,
search_end, hint_block,
&prealloc_key, 0);
if (ret)
return ret; return ret;
} }
} }
...@@ -1309,11 +1395,14 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans, ...@@ -1309,11 +1395,14 @@ struct buffer_head *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,
ret = btrfs_alloc_extent(trans, root, root->root_key.objectid, ret = btrfs_alloc_extent(trans, root, root->root_key.objectid,
1, hint, (unsigned long)-1, &ins, 0); 1, hint, (unsigned long)-1, &ins, 0);
if (ret) { if (ret) {
BUG(); BUG_ON(ret > 0);
return NULL; return ERR_PTR(ret);
} }
BUG_ON(ret);
buf = btrfs_find_create_tree_block(root, ins.objectid); buf = btrfs_find_create_tree_block(root, ins.objectid);
if (!buf) {
btrfs_free_extent(trans, root, ins.objectid, 1, 0);
return ERR_PTR(-ENOMEM);
}
set_buffer_uptodate(buf); set_buffer_uptodate(buf);
set_buffer_checked(buf); set_buffer_checked(buf);
set_radix_bit(&trans->transaction->dirty_pages, buf->b_page->index); set_radix_bit(&trans->transaction->dirty_pages, buf->b_page->index);
......
fs/btrfs/file-item.c
View file @ 54aa1f4d
...@@ -45,6 +45,8 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, ...@@ -45,6 +45,8 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
ret = btrfs_insert_empty_item(trans, root, path, &file_key, ret = btrfs_insert_empty_item(trans, root, path, &file_key,
sizeof(*item)); sizeof(*item));
if (ret < 0)
goto out;
BUG_ON(ret); BUG_ON(ret);
item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0], item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_file_extent_item); struct btrfs_file_extent_item);
...@@ -55,10 +57,9 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, ...@@ -55,10 +57,9 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
btrfs_set_file_extent_generation(item, trans->transid); btrfs_set_file_extent_generation(item, trans->transid);
btrfs_set_file_extent_type(item, BTRFS_FILE_EXTENT_REG); btrfs_set_file_extent_type(item, BTRFS_FILE_EXTENT_REG);
btrfs_mark_buffer_dirty(path->nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
out:
btrfs_release_path(root, path);
btrfs_free_path(path); btrfs_free_path(path);
return 0; return ret;
} }
struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans, struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
...@@ -213,6 +214,8 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans, ...@@ -213,6 +214,8 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
csum_offset = 0; csum_offset = 0;
ret = btrfs_insert_empty_item(trans, root, path, &file_key, ret = btrfs_insert_empty_item(trans, root, path, &file_key,
BTRFS_CRC32_SIZE); BTRFS_CRC32_SIZE);
if (ret < 0)
goto fail;
if (ret != 0) { if (ret != 0) {
WARN_ON(1); WARN_ON(1);
goto fail; goto fail;
...@@ -261,40 +264,3 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans, ...@@ -261,40 +264,3 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
int btrfs_csum_verify_file_block(struct btrfs_root *root,
u64 objectid, u64 offset,
char *data, size_t len)
{
int ret;
struct btrfs_key file_key;
struct btrfs_path *path;
struct btrfs_csum_item *item;
char result[BTRFS_CRC32_SIZE];
path = btrfs_alloc_path();
BUG_ON(!path);
file_key.objectid = objectid;
file_key.offset = offset;
file_key.flags = 0;
btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
mutex_lock(&root->fs_info->fs_mutex);
item = btrfs_lookup_csum(NULL, root, path, objectid, offset, 0);
if (IS_ERR(item)) {
ret = PTR_ERR(item);
/* a csum that isn't present is a preallocated region. */
if (ret == -ENOENT || ret == -EFBIG)
ret = -ENOENT;
goto fail;
}
ret = btrfs_csum_data(root, data, len, result);
WARN_ON(ret);
if (memcmp(result, &item->csum, BTRFS_CRC32_SIZE))
ret = 1;
fail:
btrfs_release_path(root, path);
btrfs_free_path(path);
mutex_unlock(&root->fs_info->fs_mutex);
return ret;
}
fs/btrfs/file.c
View file @ 54aa1f4d
...@@ -81,54 +81,40 @@ static void btrfs_drop_pages(struct page **pages, size_t num_pages) ...@@ -81,54 +81,40 @@ static void btrfs_drop_pages(struct page **pages, size_t num_pages)
} }
} }
static int dirty_and_release_pages(struct btrfs_trans_handle *trans, static int insert_inline_extent(struct btrfs_root *root, struct inode *inode,
struct btrfs_root *root, u64 offset, ssize_t size,
struct file *file, struct buffer_head *bh)
struct page **pages,
size_t num_pages,
loff_t pos,
size_t write_bytes)
{ {
int i;
int offset;
int err = 0;
int ret;
int this_write;
struct inode *inode = file->f_path.dentry->d_inode;
struct buffer_head *bh;
struct btrfs_file_extent_item *ei;
for (i = 0; i < num_pages; i++) {
offset = pos & (PAGE_CACHE_SIZE -1);
this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes);
/* FIXME, one block at a time */
bh = page_buffers(pages[i]);
if (buffer_mapped(bh) && bh->b_blocknr == 0) {
struct btrfs_key key; struct btrfs_key key;
struct btrfs_path *path; struct btrfs_path *path;
char *ptr, *kaddr; char *ptr, *kaddr;
struct btrfs_trans_handle *trans;
struct btrfs_file_extent_item *ei;
u32 datasize; u32 datasize;
int err = 0;
int ret;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
mutex_lock(&root->fs_info->fs_mutex); mutex_lock(&root->fs_info->fs_mutex);
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
btrfs_set_trans_block_group(trans, inode); btrfs_set_trans_block_group(trans, inode);
/* create an inline extent, and copy the data in */
path = btrfs_alloc_path();
BUG_ON(!path);
key.objectid = inode->i_ino; key.objectid = inode->i_ino;
key.offset = pages[i]->index << PAGE_CACHE_SHIFT; key.offset = offset;
key.flags = 0; key.flags = 0;
btrfs_set_key_type(&key, BTRFS_EXTENT_DATA_KEY); btrfs_set_key_type(&key, BTRFS_EXTENT_DATA_KEY);
BUG_ON(write_bytes >= PAGE_CACHE_SIZE); BUG_ON(size >= PAGE_CACHE_SIZE);
datasize = offset + datasize = btrfs_file_extent_calc_inline_size(size);
btrfs_file_extent_calc_inline_size(write_bytes);
ret = btrfs_insert_empty_item(trans, root, path, &key, ret = btrfs_insert_empty_item(trans, root, path, &key,
datasize); datasize);
BUG_ON(ret); if (ret) {
err = ret;
goto fail;
}
ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), ei = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
path->slots[0], struct btrfs_file_extent_item); path->slots[0], struct btrfs_file_extent_item);
btrfs_set_file_extent_generation(ei, trans->transid); btrfs_set_file_extent_generation(ei, trans->transid);
...@@ -139,14 +125,49 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans, ...@@ -139,14 +125,49 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
kaddr = kmap_atomic(bh->b_page, KM_USER0); kaddr = kmap_atomic(bh->b_page, KM_USER0);
btrfs_memcpy(root, path->nodes[0]->b_data, btrfs_memcpy(root, path->nodes[0]->b_data,
ptr, kaddr + bh_offset(bh), ptr, kaddr + bh_offset(bh),
offset + write_bytes); size);
kunmap_atomic(kaddr, KM_USER0); kunmap_atomic(kaddr, KM_USER0);
mark_buffer_dirty(path->nodes[0]); mark_buffer_dirty(path->nodes[0]);
fail:
btrfs_free_path(path); btrfs_free_path(path);
ret = btrfs_end_transaction(trans, root); ret = btrfs_end_transaction(trans, root);
BUG_ON(ret); if (ret && !err)
err = ret;
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
return err;
}
static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct file *file,
struct page **pages,
size_t num_pages,
loff_t pos,
size_t write_bytes)
{
int i;
int offset;
int err = 0;
int ret;
int this_write;
struct inode *inode = file->f_path.dentry->d_inode;
struct buffer_head *bh;
for (i = 0; i < num_pages; i++) {
offset = pos & (PAGE_CACHE_SIZE -1);
this_write = min((size_t)PAGE_CACHE_SIZE - offset, write_bytes);
/* FIXME, one block at a time */
bh = page_buffers(pages[i]);
if (buffer_mapped(bh) && bh->b_blocknr == 0) {
ret = insert_inline_extent(root, inode,
pages[i]->index << PAGE_CACHE_SHIFT,
offset + this_write, bh);
if (ret) {
err = ret;
goto failed;
}
} }
ret = btrfs_commit_write(file, pages[i], offset, ret = btrfs_commit_write(file, pages[i], offset,
...@@ -321,6 +342,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans, ...@@ -321,6 +342,7 @@ int btrfs_drop_extents(struct btrfs_trans_handle *trans,
btrfs_file_extent_disk_blocknr(extent); btrfs_file_extent_disk_blocknr(extent);
} }
ret = btrfs_del_item(trans, root, path); ret = btrfs_del_item(trans, root, path);
/* TODO update progress marker and return */
BUG_ON(ret); BUG_ON(ret);
btrfs_release_path(root, path); btrfs_release_path(root, path);
extent = NULL; extent = NULL;
...@@ -452,7 +474,8 @@ static int prepare_pages(struct btrfs_root *root, ...@@ -452,7 +474,8 @@ static int prepare_pages(struct btrfs_root *root,
err = btrfs_drop_extents(trans, root, inode, err = btrfs_drop_extents(trans, root, inode,
start_pos, (pos + write_bytes + root->blocksize -1) & start_pos, (pos + write_bytes + root->blocksize -1) &
~((u64)root->blocksize - 1), &hint_block); ~((u64)root->blocksize - 1), &hint_block);
BUG_ON(err); if (err)
goto failed_release;
} }
/* insert any holes we need to create */ /* insert any holes we need to create */
...@@ -469,7 +492,8 @@ static int prepare_pages(struct btrfs_root *root, ...@@ -469,7 +492,8 @@ static int prepare_pages(struct btrfs_root *root,
last_pos_in_file, last_pos_in_file,
0, 0, hole_size); 0, 0, hole_size);
} }
BUG_ON(err); if (err)
goto failed_release;
} }
/* /*
...@@ -481,11 +505,13 @@ static int prepare_pages(struct btrfs_root *root, ...@@ -481,11 +505,13 @@ static int prepare_pages(struct btrfs_root *root,
err = btrfs_alloc_extent(trans, root, inode->i_ino, err = btrfs_alloc_extent(trans, root, inode->i_ino,
num_blocks, hint_block, (u64)-1, num_blocks, hint_block, (u64)-1,
&ins, 1); &ins, 1);
BUG_ON(err); if (err)
goto failed_truncate;
err = btrfs_insert_file_extent(trans, root, inode->i_ino, err = btrfs_insert_file_extent(trans, root, inode->i_ino,
start_pos, ins.objectid, ins.offset, start_pos, ins.objectid, ins.offset,
ins.offset); ins.offset);
BUG_ON(err); if (err)
goto failed_truncate;
} else { } else {
ins.offset = 0; ins.offset = 0;
ins.objectid = 0; ins.objectid = 0;
...@@ -618,16 +644,21 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf, ...@@ -618,16 +644,21 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
ret = prepare_pages(root, file, pages, num_pages, ret = prepare_pages(root, file, pages, num_pages,
pos, first_index, last_index, pos, first_index, last_index,
write_bytes); write_bytes);
BUG_ON(ret); if (ret)
goto out;
ret = btrfs_copy_from_user(pos, num_pages, ret = btrfs_copy_from_user(pos, num_pages,
write_bytes, pages, buf); write_bytes, pages, buf);
BUG_ON(ret); if (ret) {
btrfs_drop_pages(pages, num_pages);
goto out;
}
ret = dirty_and_release_pages(NULL, root, file, pages, ret = dirty_and_release_pages(NULL, root, file, pages,
num_pages, pos, write_bytes); num_pages, pos, write_bytes);
BUG_ON(ret);
btrfs_drop_pages(pages, num_pages); btrfs_drop_pages(pages, num_pages);
if (ret)
goto out;
buf += write_bytes; buf += write_bytes;
count -= write_bytes; count -= write_bytes;
......
fs/btrfs/inode.c
View file @ 54aa1f4d
This diff is collapsed.
fs/btrfs/root-tree.c
View file @ 54aa1f4d
...@@ -90,7 +90,6 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root ...@@ -90,7 +90,6 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
{ {
int ret; int ret;
ret = btrfs_insert_item(trans, root, key, item, sizeof(*item)); ret = btrfs_insert_item(trans, root, key, item, sizeof(*item));
BUG_ON(ret);
return ret; return ret;
} }
......
fs/btrfs/super.c
View file @ 54aa1f4d
...@@ -125,9 +125,8 @@ static int btrfs_sync_fs(struct super_block *sb, int wait) ...@@ -125,9 +125,8 @@ static int btrfs_sync_fs(struct super_block *sb, int wait)
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
ret = btrfs_commit_transaction(trans, root); ret = btrfs_commit_transaction(trans, root);
sb->s_dirt = 0; sb->s_dirt = 0;
BUG_ON(ret);
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
return 0; return ret;
} }
static void btrfs_write_super(struct super_block *sb) static void btrfs_write_super(struct super_block *sb)
......
fs/btrfs/transaction.c
View file @ 54aa1f4d
...@@ -219,7 +219,8 @@ static int add_dirty_roots(struct btrfs_trans_handle *trans, ...@@ -219,7 +219,8 @@ static int add_dirty_roots(struct btrfs_trans_handle *trans,
struct btrfs_root *root; struct btrfs_root *root;
int i; int i;
int ret; int ret;
int err; int err = 0;
while(1) { while(1) {
ret = radix_tree_gang_lookup_tag(radix, (void **)gang, 0, ret = radix_tree_gang_lookup_tag(radix, (void **)gang, 0,
ARRAY_SIZE(gang), ARRAY_SIZE(gang),
...@@ -251,11 +252,12 @@ static int add_dirty_roots(struct btrfs_trans_handle *trans, ...@@ -251,11 +252,12 @@ static int add_dirty_roots(struct btrfs_trans_handle *trans,
err = btrfs_insert_root(trans, root->fs_info->tree_root, err = btrfs_insert_root(trans, root->fs_info->tree_root,
&root->root_key, &root->root_key,
&root->root_item); &root->root_item);
BUG_ON(err); if (err)
break;
list_add(&dirty->list, list); list_add(&dirty->list, list);
} }
} }
return 0; return err;
} }
static int drop_dirty_roots(struct btrfs_root *tree_root, static int drop_dirty_roots(struct btrfs_root *tree_root,
...@@ -263,7 +265,7 @@ static int drop_dirty_roots(struct btrfs_root *tree_root, ...@@ -263,7 +265,7 @@ static int drop_dirty_roots(struct btrfs_root *tree_root,
{ {
struct dirty_root *dirty; struct dirty_root *dirty;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
int ret; int ret = 0;
while(!list_empty(list)) { while(!list_empty(list)) {
mutex_lock(&tree_root->fs_info->fs_mutex); mutex_lock(&tree_root->fs_info->fs_mutex);
dirty = list_entry(list->next, struct dirty_root, list); dirty = list_entry(list->next, struct dirty_root, list);
...@@ -274,14 +276,15 @@ static int drop_dirty_roots(struct btrfs_root *tree_root, ...@@ -274,14 +276,15 @@ static int drop_dirty_roots(struct btrfs_root *tree_root,
BUG_ON(ret); BUG_ON(ret);
ret = btrfs_del_root(trans, tree_root, &dirty->snap_key); ret = btrfs_del_root(trans, tree_root, &dirty->snap_key);
BUG_ON(ret); if (ret)
break;
ret = btrfs_end_transaction(trans, tree_root); ret = btrfs_end_transaction(trans, tree_root);
BUG_ON(ret); BUG_ON(ret);
kfree(dirty); kfree(dirty);
mutex_unlock(&tree_root->fs_info->fs_mutex); mutex_unlock(&tree_root->fs_info->fs_mutex);
btrfs_btree_balance_dirty(tree_root); btrfs_btree_balance_dirty(tree_root);
} }
return 0; return ret;
} }
int btrfs_commit_transaction(struct btrfs_trans_handle *trans, int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
...@@ -321,9 +324,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, ...@@ -321,9 +324,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
} }
finish_wait(&trans->transaction->writer_wait, &wait); finish_wait(&trans->transaction->writer_wait, &wait);
WARN_ON(cur_trans != trans->transaction); WARN_ON(cur_trans != trans->transaction);
add_dirty_roots(trans, &root->fs_info->fs_roots_radix, &dirty_fs_roots); ret = add_dirty_roots(trans, &root->fs_info->fs_roots_radix,
&dirty_fs_roots);
BUG_ON(ret);
ret = btrfs_commit_tree_roots(trans, root); ret = btrfs_commit_tree_roots(trans, root);
BUG_ON(ret); BUG_ON(ret);
cur_trans = root->fs_info->running_transaction; cur_trans = root->fs_info->running_transaction;
root->fs_info->running_transaction = NULL; root->fs_info->running_transaction = NULL;
if (cur_trans->list.prev != &root->fs_info->trans_list) { if (cur_trans->list.prev != &root->fs_info->trans_list) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7