adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 05:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Btrfs: dynamic allocation of path struct

Browse source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-04-02 11:20:42 -04:00 committed by David Woodhouse
parent 2c90e5d658
commit 5caf2a0029
6 changed files with 243 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/btrfs/dir-item.c
View file

@ -9,7 +9,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
objectid, u8 type) objectid, u8 type)
{ {
int ret = 0; int ret = 0;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_dir_item *dir_item; struct btrfs_dir_item *dir_item;
char *name_ptr; char *name_ptr;
struct btrfs_key key; struct btrfs_key key;
@ -20,24 +20,26 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
ret = btrfs_name_hash(name, name_len, &key.offset); ret = btrfs_name_hash(name, name_len, &key.offset);
BUG_ON(ret); BUG_ON(ret);
btrfs_init_path(&path); path = btrfs_alloc_path();
btrfs_init_path(path);
data_size = sizeof(*dir_item) + name_len; data_size = sizeof(*dir_item) + name_len;
ret = btrfs_insert_empty_item(trans, root, &path, &key, data_size); ret = btrfs_insert_empty_item(trans, root, path, &key, data_size);
if (ret) if (ret)
goto out; goto out;
dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
path.slots[0], path->slots[0],
struct btrfs_dir_item); struct btrfs_dir_item);
btrfs_set_dir_objectid(dir_item, objectid); btrfs_set_dir_objectid(dir_item, objectid);
btrfs_set_dir_type(dir_item, type); btrfs_set_dir_type(dir_item, type);
btrfs_set_dir_flags(dir_item, 0); btrfs_set_dir_flags(dir_item, 0);
btrfs_set_dir_name_len(dir_item, name_len); btrfs_set_dir_name_len(dir_item, name_len);
name_ptr = (char *)(dir_item + 1); name_ptr = (char *)(dir_item + 1);
btrfs_memcpy(root, path.nodes[0]->b_data, name_ptr, name, name_len); btrfs_memcpy(root, path->nodes[0]->b_data, name_ptr, name, name_len);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
out: out:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }

100
fs/btrfs/extent-tree.c
View file

@ -15,7 +15,7 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 blocknr, u64 num_blocks) *root, u64 blocknr, u64 num_blocks)
{ {
struct btrfs_path path; struct btrfs_path *path;
int ret; int ret;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_leaf *l; struct btrfs_leaf *l;
@ -25,23 +25,26 @@ static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
find_free_extent(trans, root->fs_info->extent_root, 0, 0, (u64)-1, find_free_extent(trans, root->fs_info->extent_root, 0, 0, (u64)-1,
&ins); &ins);
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
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) if (ret != 0)
BUG(); BUG();
BUG_ON(ret != 0); BUG_ON(ret != 0);
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_set_extent_refs(item, refs + 1); btrfs_set_extent_refs(item, refs + 1);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
btrfs_release_path(root->fs_info->extent_root, &path); btrfs_release_path(root->fs_info->extent_root, path);
btrfs_free_path(path);
finish_current_insert(trans, root->fs_info->extent_root); finish_current_insert(trans, root->fs_info->extent_root);
del_pending_extents(trans, root->fs_info->extent_root); del_pending_extents(trans, root->fs_info->extent_root);
return 0; return 0;
@ -50,24 +53,27 @@ static int inc_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
static int lookup_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root static int lookup_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 blocknr, u64 num_blocks, u32 *refs) *root, u64 blocknr, u64 num_blocks, u32 *refs)
{ {
struct btrfs_path path; struct btrfs_path *path;
int ret; int ret;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_leaf *l; struct btrfs_leaf *l;
struct btrfs_extent_item *item; struct btrfs_extent_item *item;
btrfs_init_path(&path);
path = btrfs_alloc_path();
btrfs_init_path(path);
key.objectid = blocknr; key.objectid = blocknr;
key.offset = num_blocks; key.offset = num_blocks;
key.flags = 0; key.flags = 0;
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) 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); btrfs_release_path(root->fs_info->extent_root, path);
btrfs_free_path(path);
return 0; return 0;
} }
@ -200,7 +206,7 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 blocknr, u64 num_blocks, int pin) *root, u64 blocknr, u64 num_blocks, int pin)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_fs_info *info = root->fs_info; struct btrfs_fs_info *info = root->fs_info;
struct btrfs_root *extent_root = info->extent_root; struct btrfs_root *extent_root = info->extent_root;
@ -215,20 +221,22 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
key.offset = num_blocks; key.offset = num_blocks;
find_free_extent(trans, root, 0, 0, (u64)-1, &ins); find_free_extent(trans, root, 0, 0, (u64)-1, &ins);
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_search_slot(trans, extent_root, &key, &path, -1, 1); BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_search_slot(trans, extent_root, &key, path, -1, 1);
if (ret) { if (ret) {
printk("failed to find %Lu\n", key.objectid); printk("failed to find %Lu\n", key.objectid);
btrfs_print_tree(extent_root, extent_root->node); btrfs_print_tree(extent_root, extent_root->node);
printk("failed to find %Lu\n", key.objectid); printk("failed to find %Lu\n", key.objectid);
BUG(); BUG();
} }
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);
refs = btrfs_extent_refs(ei) - 1; refs = btrfs_extent_refs(ei) - 1;
btrfs_set_extent_refs(ei, refs); btrfs_set_extent_refs(ei, refs);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
if (refs == 0) { if (refs == 0) {
u64 super_blocks_used; u64 super_blocks_used;
@ -240,13 +248,14 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
super_blocks_used = btrfs_super_blocks_used(info->disk_super); super_blocks_used = btrfs_super_blocks_used(info->disk_super);
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 (extent_root->fs_info->last_insert.objectid > blocknr) if (extent_root->fs_info->last_insert.objectid > blocknr)
extent_root->fs_info->last_insert.objectid = blocknr; extent_root->fs_info->last_insert.objectid = blocknr;
if (ret) if (ret)
BUG(); BUG();
} }
btrfs_release_path(extent_root, &path); btrfs_release_path(extent_root, path);
btrfs_free_path(path);
finish_current_insert(trans, extent_root); finish_current_insert(trans, extent_root);
return ret; return ret;
} }
@ -319,7 +328,7 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
*orig_root, u64 num_blocks, u64 search_start, u64 *orig_root, u64 num_blocks, u64 search_start, u64
search_end, struct btrfs_key *ins) search_end, struct btrfs_key *ins)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
int ret; int ret;
u64 hole_size = 0; u64 hole_size = 0;
@ -339,24 +348,25 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
ins->flags = 0; ins->flags = 0;
btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY); btrfs_set_key_type(ins, BTRFS_EXTENT_ITEM_KEY);
path = btrfs_alloc_path();
check_failed: check_failed:
btrfs_init_path(&path); btrfs_init_path(path);
ins->objectid = search_start; ins->objectid = search_start;
ins->offset = 0; ins->offset = 0;
start_found = 0; start_found = 0;
ret = btrfs_search_slot(trans, root, ins, &path, 0, 0); ret = btrfs_search_slot(trans, root, ins, path, 0, 0);
if (ret < 0) if (ret < 0)
goto error; goto error;
if (path.slots[0] > 0) if (path->slots[0] > 0)
path.slots[0]--; path->slots[0]--;
while (1) { while (1) {
l = btrfs_buffer_leaf(path.nodes[0]); l = btrfs_buffer_leaf(path->nodes[0]);
slot = path.slots[0]; slot = path->slots[0];
if (slot >= btrfs_header_nritems(&l->header)) { if (slot >= btrfs_header_nritems(&l->header)) {
ret = btrfs_next_leaf(root, &path); ret = btrfs_next_leaf(root, path);
if (ret == 0) if (ret == 0)
continue; continue;
if (ret < 0) if (ret < 0)
@ -387,14 +397,14 @@ check_failed:
} }
start_found = 1; start_found = 1;
last_block = key.objectid + key.offset; last_block = key.objectid + key.offset;
path.slots[0]++; path->slots[0]++;
} }
// FIXME -ENOSPC // 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
*/ */
btrfs_release_path(root, &path); btrfs_release_path(root, path);
BUG_ON(ins->objectid < search_start); BUG_ON(ins->objectid < search_start);
for (test_block = ins->objectid; for (test_block = ins->objectid;
test_block < ins->objectid + total_needed; test_block++) { test_block < ins->objectid + total_needed; test_block++) {
@ -410,9 +420,11 @@ check_pending:
root->fs_info->current_insert.flags = 0; root->fs_info->current_insert.flags = 0;
root->fs_info->last_insert.objectid = ins->objectid; root->fs_info->last_insert.objectid = ins->objectid;
ins->offset = num_blocks; ins->offset = num_blocks;
btrfs_free_path(path);
return 0; return 0;
error: error:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -533,6 +545,8 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
int ret; int ret;
u32 refs; u32 refs;
WARN_ON(*level < 0);
WARN_ON(*level >= BTRFS_MAX_LEVEL);
ret = lookup_block_ref(trans, root, path->nodes[*level]->b_blocknr, ret = lookup_block_ref(trans, root, path->nodes[*level]->b_blocknr,
1, &refs); 1, &refs);
BUG_ON(ret); BUG_ON(ret);
@ -542,6 +556,8 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
* walk down to the last node level and free all the leaves * walk down to the last node level and free all the leaves
*/ */
while(*level >= 0) { while(*level >= 0) {
WARN_ON(*level < 0);
WARN_ON(*level >= BTRFS_MAX_LEVEL);
cur = path->nodes[*level]; cur = path->nodes[*level];
if (btrfs_header_level(btrfs_buffer_header(cur)) != *level) if (btrfs_header_level(btrfs_buffer_header(cur)) != *level)
WARN_ON(1); WARN_ON(1);
@ -564,6 +580,7 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
continue; continue;
} }
next = read_tree_block(root, blocknr); next = read_tree_block(root, blocknr);
WARN_ON(*level <= 0);
if (path->nodes[*level-1]) if (path->nodes[*level-1])
btrfs_block_release(root, path->nodes[*level-1]); btrfs_block_release(root, path->nodes[*level-1]);
path->nodes[*level-1] = next; path->nodes[*level-1] = next;
@ -571,6 +588,8 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root
path->slots[*level] = 0; path->slots[*level] = 0;
} }
out: out:
WARN_ON(*level < 0);
WARN_ON(*level >= BTRFS_MAX_LEVEL);
ret = btrfs_free_extent(trans, root, ret = btrfs_free_extent(trans, root,
path->nodes[*level]->b_blocknr, 1, 1); path->nodes[*level]->b_blocknr, 1, 1);
btrfs_block_release(root, path->nodes[*level]); btrfs_block_release(root, path->nodes[*level]);
@ -622,33 +641,36 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root
int ret = 0; int ret = 0;
int wret; int wret;
int level; int level;
struct btrfs_path path; struct btrfs_path *path;
int i; int i;
int orig_level; int orig_level;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
level = btrfs_header_level(btrfs_buffer_header(snap)); level = btrfs_header_level(btrfs_buffer_header(snap));
orig_level = level; orig_level = level;
path.nodes[level] = snap; path->nodes[level] = snap;
path.slots[level] = 0; path->slots[level] = 0;
while(1) { while(1) {
wret = walk_down_tree(trans, root, &path, &level); wret = walk_down_tree(trans, root, path, &level);
if (wret > 0) if (wret > 0)
break; break;
if (wret < 0) if (wret < 0)
ret = wret; ret = wret;
wret = walk_up_tree(trans, root, &path, &level); wret = walk_up_tree(trans, root, path, &level);
if (wret > 0) if (wret > 0)
break; break;
if (wret < 0) if (wret < 0)
ret = wret; ret = wret;
} }
for (i = 0; i <= orig_level; i++) { for (i = 0; i <= orig_level; i++) {
if (path.nodes[i]) { if (path->nodes[i]) {
btrfs_block_release(root, path.nodes[i]); btrfs_block_release(root, path->nodes[i]);
} }
} }
btrfs_free_path(path);
return ret; return ret;
} }

43
fs/btrfs/file-item.c
View file

@ -13,9 +13,11 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
int ret = 0; int ret = 0;
struct btrfs_file_extent_item *item; struct btrfs_file_extent_item *item;
struct btrfs_key file_key; struct btrfs_key file_key;
struct btrfs_path path; struct btrfs_path *path;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_alloc_extent(trans, root, num_blocks, hint_block, ret = btrfs_alloc_extent(trans, root, num_blocks, hint_block,
(u64)-1, objectid, &ins); (u64)-1, objectid, &ins);
BUG_ON(ret); BUG_ON(ret);
@ -24,19 +26,20 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
file_key.flags = 0; file_key.flags = 0;
btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY); btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
ret = btrfs_insert_empty_item(trans, root, &path, &file_key, ret = btrfs_insert_empty_item(trans, root, path, &file_key,
sizeof(*item)); sizeof(*item));
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);
btrfs_set_file_extent_disk_blocknr(item, ins.objectid); btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
btrfs_set_file_extent_disk_num_blocks(item, ins.offset); btrfs_set_file_extent_disk_num_blocks(item, ins.offset);
btrfs_set_file_extent_offset(item, 0); btrfs_set_file_extent_offset(item, 0);
btrfs_set_file_extent_num_blocks(item, ins.offset); btrfs_set_file_extent_num_blocks(item, ins.offset);
btrfs_set_file_extent_generation(item, trans->transid); btrfs_set_file_extent_generation(item, trans->transid);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
*result = ins.objectid; *result = ins.objectid;
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return 0; return 0;
} }
@ -65,25 +68,28 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
{ {
int ret; int ret;
struct btrfs_key file_key; struct btrfs_key file_key;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_csum_item *item; struct btrfs_csum_item *item;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
file_key.objectid = objectid; file_key.objectid = objectid;
file_key.offset = offset; file_key.offset = offset;
file_key.flags = 0; file_key.flags = 0;
btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY); btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
ret = btrfs_insert_empty_item(trans, root, &path, &file_key, ret = btrfs_insert_empty_item(trans, root, path, &file_key,
BTRFS_CSUM_SIZE); BTRFS_CSUM_SIZE);
if (ret != 0 && ret != -EEXIST) if (ret != 0 && ret != -EEXIST)
goto fail; goto fail;
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_csum_item); struct btrfs_csum_item);
ret = 0; ret = 0;
ret = btrfs_csum_data(root, data, len, item->csum); ret = btrfs_csum_data(root, data, len, item->csum);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
fail: fail:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -93,19 +99,21 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
{ {
int ret; int ret;
struct btrfs_key file_key; struct btrfs_key file_key;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_csum_item *item; struct btrfs_csum_item *item;
char result[BTRFS_CSUM_SIZE]; char result[BTRFS_CSUM_SIZE];
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
file_key.objectid = objectid; file_key.objectid = objectid;
file_key.offset = offset; file_key.offset = offset;
file_key.flags = 0; file_key.flags = 0;
btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY); btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
ret = btrfs_search_slot(NULL, root, &file_key, &path, 0, 0); ret = btrfs_search_slot(NULL, root, &file_key, path, 0, 0);
if (ret) if (ret)
goto fail; goto fail;
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_csum_item); struct btrfs_csum_item);
ret = 0; ret = 0;
ret = btrfs_csum_data(root, data, len, result); ret = btrfs_csum_data(root, data, len, result);
@ -113,7 +121,8 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
if (memcmp(result, item->csum, BTRFS_CSUM_SIZE)) if (memcmp(result, item->csum, BTRFS_CSUM_SIZE))
ret = 1; ret = 1;
fail: fail:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }

9
fs/btrfs/inode-item.c
View file

@ -7,7 +7,7 @@ int btrfs_insert_inode(struct btrfs_trans_handle *trans, struct btrfs_root
*root, u64 objectid, struct btrfs_inode_item *root, u64 objectid, struct btrfs_inode_item
*inode_item) *inode_item)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
int ret; int ret;
key.objectid = objectid; key.objectid = objectid;
@ -15,10 +15,13 @@ int btrfs_insert_inode(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
key.offset = 0; key.offset = 0;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_insert_item(trans, root, &key, inode_item, ret = btrfs_insert_item(trans, root, &key, inode_item,
sizeof(*inode_item)); sizeof(*inode_item));
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }

47
fs/btrfs/root-tree.c
View file

@ -6,7 +6,7 @@
int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
struct btrfs_root_item *item, struct btrfs_key *key) struct btrfs_root_item *item, struct btrfs_key *key)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key search_key; struct btrfs_key search_key;
struct btrfs_leaf *l; struct btrfs_leaf *l;
int ret; int ret;
@ -16,14 +16,16 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
search_key.flags = (u32)-1; search_key.flags = (u32)-1;
search_key.offset = (u32)-1; search_key.offset = (u32)-1;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_search_slot(NULL, root, &search_key, &path, 0, 0); BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
if (ret < 0) if (ret < 0)
goto out; goto out;
BUG_ON(ret == 0); BUG_ON(ret == 0);
l = btrfs_buffer_leaf(path.nodes[0]); l = btrfs_buffer_leaf(path->nodes[0]);
BUG_ON(path.slots[0] == 0); BUG_ON(path->slots[0] == 0);
slot = path.slots[0] - 1; slot = path->slots[0] - 1;
if (btrfs_disk_key_objectid(&l->items[slot].key) != objectid) { if (btrfs_disk_key_objectid(&l->items[slot].key) != objectid) {
ret = 1; ret = 1;
goto out; goto out;
@ -31,9 +33,10 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
memcpy(item, btrfs_item_ptr(l, slot, struct btrfs_root_item), memcpy(item, btrfs_item_ptr(l, slot, struct btrfs_root_item),
sizeof(*item)); sizeof(*item));
btrfs_disk_key_to_cpu(key, &l->items[slot].key); btrfs_disk_key_to_cpu(key, &l->items[slot].key);
btrfs_release_path(root, &path);
ret = 0; ret = 0;
out: out:
btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -41,24 +44,27 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
*root, struct btrfs_key *key, struct btrfs_root_item *root, struct btrfs_key *key, struct btrfs_root_item
*item) *item)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_leaf *l; struct btrfs_leaf *l;
int ret; int ret;
int slot; int slot;
struct btrfs_root_item *update_item; struct btrfs_root_item *update_item;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_search_slot(trans, root, key, &path, 0, 1); BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_search_slot(trans, root, key, path, 0, 1);
if (ret < 0) if (ret < 0)
goto out; goto out;
BUG_ON(ret != 0); BUG_ON(ret != 0);
l = btrfs_buffer_leaf(path.nodes[0]); l = btrfs_buffer_leaf(path->nodes[0]);
slot = path.slots[0]; slot = path->slots[0];
update_item = btrfs_item_ptr(l, slot, struct btrfs_root_item); update_item = btrfs_item_ptr(l, slot, struct btrfs_root_item);
btrfs_memcpy(root, l, update_item, item, sizeof(*item)); btrfs_memcpy(root, l, update_item, item, sizeof(*item));
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
out: out:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -75,16 +81,19 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
struct btrfs_key *key) struct btrfs_key *key)
{ {
struct btrfs_path path; struct btrfs_path *path;
int ret; int ret;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_search_slot(trans, root, key, &path, -1, 1); BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_search_slot(trans, root, key, path, -1, 1);
if (ret < 0) if (ret < 0)
goto out; goto out;
BUG_ON(ret != 0); BUG_ON(ret != 0);
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
out: out:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }

198
fs/btrfs/super.c
View file

@ -35,25 +35,27 @@ static int check_inode(struct inode *inode)
static void btrfs_read_locked_inode(struct inode *inode) static void btrfs_read_locked_inode(struct inode *inode)
{ {
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct btrfs_root *root = btrfs_sb(inode->i_sb); struct btrfs_root *root = btrfs_sb(inode->i_sb);
int ret; int ret;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
mutex_lock(&root->fs_info->fs_mutex); mutex_lock(&root->fs_info->fs_mutex);
check_inode(inode); check_inode(inode);
ret = btrfs_lookup_inode(NULL, root, &path, inode->i_ino, 0); ret = btrfs_lookup_inode(NULL, root, path, inode->i_ino, 0);
if (ret) { if (ret) {
btrfs_release_path(root, &path); btrfs_release_path(root, path);
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
make_bad_inode(inode); make_bad_inode(inode);
return; return;
} }
check_inode(inode); check_inode(inode);
inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
path.slots[0], path->slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
inode->i_mode = btrfs_inode_mode(inode_item); inode->i_mode = btrfs_inode_mode(inode_item);
@ -69,7 +71,11 @@ static void btrfs_read_locked_inode(struct inode *inode)
inode->i_ctime.tv_nsec = btrfs_timespec_nsec(&inode_item->ctime); inode->i_ctime.tv_nsec = btrfs_timespec_nsec(&inode_item->ctime);
inode->i_blocks = btrfs_inode_nblocks(inode_item); inode->i_blocks = btrfs_inode_nblocks(inode_item);
inode->i_generation = btrfs_inode_generation(inode_item); inode->i_generation = btrfs_inode_generation(inode_item);
btrfs_release_path(root, &path);
btrfs_release_path(root, path);
btrfs_free_path(path);
inode_item = NULL;
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
check_inode(inode); check_inode(inode);
switch (inode->i_mode & S_IFMT) { switch (inode->i_mode & S_IFMT) {
@ -101,15 +107,17 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
struct inode *dir, struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
struct btrfs_path path; struct btrfs_path *path;
const char *name = dentry->d_name.name; const char *name = dentry->d_name.name;
int name_len = dentry->d_name.len; int name_len = dentry->d_name.len;
int ret; int ret;
u64 objectid; u64 objectid;
struct btrfs_dir_item *di; struct btrfs_dir_item *di;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_lookup_dir_item(trans, root, &path, dir->i_ino, BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_lookup_dir_item(trans, root, path, dir->i_ino,
name, name_len, -1); name, name_len, -1);
if (ret < 0) if (ret < 0)
goto err; goto err;
@ -117,15 +125,16 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
ret = -ENOENT; ret = -ENOENT;
goto err; goto err;
} }
di = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_dir_item); struct btrfs_dir_item);
objectid = btrfs_dir_objectid(di); objectid = btrfs_dir_objectid(di);
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
BUG_ON(ret); BUG_ON(ret);
dentry->d_inode->i_ctime = dir->i_ctime; dentry->d_inode->i_ctime = dir->i_ctime;
err: err:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
if (ret == 0) if (ret == 0)
inode_dec_link_count(dentry->d_inode); inode_dec_link_count(dentry->d_inode);
return ret; return ret;
@ -152,30 +161,32 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
int err; int err;
int ret; int ret;
struct btrfs_root *root = btrfs_sb(dir->i_sb); struct btrfs_root *root = btrfs_sb(dir->i_sb);
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
struct btrfs_disk_key *found_key; struct btrfs_disk_key *found_key;
struct btrfs_leaf *leaf; struct btrfs_leaf *leaf;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
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);
key.objectid = inode->i_ino; key.objectid = inode->i_ino;
key.offset = (u64)-1; key.offset = (u64)-1;
key.flags = 0; key.flags = 0;
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
ret = btrfs_search_slot(trans, root, &key, &path, -1, 1); ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
goto out; goto out;
} }
BUG_ON(ret == 0); BUG_ON(ret == 0);
BUG_ON(path.slots[0] == 0); BUG_ON(path->slots[0] == 0);
path.slots[0]--; path->slots[0]--;
leaf = btrfs_buffer_leaf(path.nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
found_key = &leaf->items[path.slots[0]].key; found_key = &leaf->items[path->slots[0]].key;
if (btrfs_disk_key_objectid(found_key) != inode->i_ino) { if (btrfs_disk_key_objectid(found_key) != inode->i_ino) {
err = -ENOENT; err = -ENOENT;
goto out; goto out;
@ -185,11 +196,11 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
err = -ENOTEMPTY; err = -ENOTEMPTY;
goto out; goto out;
} }
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
BUG_ON(ret); BUG_ON(ret);
btrfs_release_path(root, &path); btrfs_release_path(root, path);
key.offset = 1; key.offset = 1;
ret = btrfs_search_slot(trans, root, &key, &path, -1, 1); ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
goto out; goto out;
@ -198,12 +209,13 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
err = -ENOTEMPTY; err = -ENOTEMPTY;
goto out; goto out;
} }
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
if (ret) { if (ret) {
err = ret; err = ret;
goto out; goto out;
} }
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
/* now the directory is empty */ /* now the directory is empty */
err = btrfs_unlink_trans(trans, root, dir, dentry); err = btrfs_unlink_trans(trans, root, dir, dentry);
@ -223,33 +235,36 @@ static int btrfs_free_inode(struct btrfs_trans_handle *trans,
struct inode *inode) struct inode *inode)
{ {
u64 objectid = inode->i_ino; u64 objectid = inode->i_ino;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_inode_map_item *map; struct btrfs_inode_map_item *map;
struct btrfs_key stat_data_key; struct btrfs_key stat_data_key;
int ret; int ret;
clear_inode(inode); clear_inode(inode);
btrfs_init_path(&path);
ret = btrfs_lookup_inode_map(trans, root, &path, objectid, -1); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_lookup_inode_map(trans, root, path, objectid, -1);
if (ret) { if (ret) {
if (ret > 0) if (ret > 0)
ret = -ENOENT; ret = -ENOENT;
btrfs_release_path(root, &path);
goto error; goto error;
} }
map = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], map = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_inode_map_item); struct btrfs_inode_map_item);
btrfs_disk_key_to_cpu(&stat_data_key, &map->key); btrfs_disk_key_to_cpu(&stat_data_key, &map->key);
ret = btrfs_del_item(trans, root->fs_info->inode_root, &path); ret = btrfs_del_item(trans, root->fs_info->inode_root, path);
BUG_ON(ret); BUG_ON(ret);
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_init_path(&path);
ret = btrfs_lookup_inode(trans, root, &path, objectid, -1); ret = btrfs_lookup_inode(trans, root, path, objectid, -1);
BUG_ON(ret); BUG_ON(ret);
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
BUG_ON(ret); BUG_ON(ret);
btrfs_release_path(root, &path);
error: error:
btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -258,7 +273,7 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
struct inode *inode) struct inode *inode)
{ {
int ret; int ret;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_disk_key *found_key; struct btrfs_disk_key *found_key;
struct btrfs_leaf *leaf; struct btrfs_leaf *leaf;
@ -267,24 +282,25 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
u64 extent_num_blocks = 0; u64 extent_num_blocks = 0;
int found_extent; int found_extent;
path = btrfs_alloc_path();
BUG_ON(!path);
/* FIXME, add redo link to tree so we don't leak on crash */ /* FIXME, add redo link to tree so we don't leak on crash */
key.objectid = inode->i_ino; key.objectid = inode->i_ino;
key.offset = (u64)-1; key.offset = (u64)-1;
key.flags = 0; key.flags = 0;
btrfs_set_key_type(&key, BTRFS_CSUM_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_CSUM_ITEM_KEY);
while(1) { while(1) {
btrfs_init_path(&path); btrfs_init_path(path);
ret = btrfs_search_slot(trans, root, &key, &path, -1, 1); ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
if (ret < 0) { if (ret < 0) {
btrfs_release_path(root, &path);
goto error; goto error;
} }
if (ret > 0) { if (ret > 0) {
BUG_ON(path.slots[0] == 0); BUG_ON(path->slots[0] == 0);
path.slots[0]--; path->slots[0]--;
} }
leaf = btrfs_buffer_leaf(path.nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
found_key = &leaf->items[path.slots[0]].key; found_key = &leaf->items[path->slots[0]].key;
if (btrfs_disk_key_objectid(found_key) != inode->i_ino) if (btrfs_disk_key_objectid(found_key) != inode->i_ino)
break; break;
if (btrfs_disk_key_type(found_key) != BTRFS_CSUM_ITEM_KEY && if (btrfs_disk_key_type(found_key) != BTRFS_CSUM_ITEM_KEY &&
@ -293,8 +309,8 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
if (btrfs_disk_key_offset(found_key) < inode->i_size) if (btrfs_disk_key_offset(found_key) < inode->i_size)
break; break;
if (btrfs_disk_key_type(found_key) == BTRFS_EXTENT_DATA_KEY) { if (btrfs_disk_key_type(found_key) == BTRFS_EXTENT_DATA_KEY) {
fi = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), fi = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
path.slots[0], path->slots[0],
struct btrfs_file_extent_item); struct btrfs_file_extent_item);
extent_start = btrfs_file_extent_disk_blocknr(fi); extent_start = btrfs_file_extent_disk_blocknr(fi);
extent_num_blocks = extent_num_blocks =
@ -305,18 +321,19 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
} else { } else {
found_extent = 0; found_extent = 0;
} }
ret = btrfs_del_item(trans, root, &path); ret = btrfs_del_item(trans, root, path);
BUG_ON(ret); BUG_ON(ret);
btrfs_release_path(root, &path); btrfs_release_path(root, path);
if (found_extent) { if (found_extent) {
ret = btrfs_free_extent(trans, root, extent_start, ret = btrfs_free_extent(trans, root, extent_start,
extent_num_blocks, 0); extent_num_blocks, 0);
BUG_ON(ret); BUG_ON(ret);
} }
} }
btrfs_release_path(root, &path);
ret = 0; ret = 0;
error: error:
btrfs_release_path(root, path);
btrfs_free_path(path);
return ret; return ret;
} }
@ -351,23 +368,26 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
const char *name = dentry->d_name.name; const char *name = dentry->d_name.name;
int namelen = dentry->d_name.len; int namelen = dentry->d_name.len;
struct btrfs_dir_item *di; struct btrfs_dir_item *di;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_root *root = btrfs_sb(dir->i_sb); struct btrfs_root *root = btrfs_sb(dir->i_sb);
int ret; int ret;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_lookup_dir_item(NULL, root, &path, dir->i_ino, name, BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_lookup_dir_item(NULL, root, path, dir->i_ino, name,
namelen, 0); namelen, 0);
if (ret || !btrfs_match_dir_item_name(root, &path, name, namelen)) { if (ret || !btrfs_match_dir_item_name(root, path, name, namelen)) {
*ino = 0; *ino = 0;
ret = 0; ret = 0;
goto out; goto out;
} }
di = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0], di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
struct btrfs_dir_item); struct btrfs_dir_item);
*ino = btrfs_dir_objectid(di); *ino = btrfs_dir_objectid(di);
out: out:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
check_inode(dir); check_inode(dir);
return ret; return ret;
} }
@ -405,7 +425,7 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
struct btrfs_item *item; struct btrfs_item *item;
struct btrfs_dir_item *di; struct btrfs_dir_item *di;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_path path; struct btrfs_path *path;
int ret; int ret;
u32 nritems; u32 nritems;
struct btrfs_leaf *leaf; struct btrfs_leaf *leaf;
@ -419,27 +439,28 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
key.flags = 0; key.flags = 0;
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
key.offset = filp->f_pos; key.offset = filp->f_pos;
btrfs_init_path(&path); path = btrfs_alloc_path();
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0); btrfs_init_path(path);
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0) { if (ret < 0) {
goto err; goto err;
} }
advance = 0; advance = 0;
while(1) { while(1) {
leaf = btrfs_buffer_leaf(path.nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
nritems = btrfs_header_nritems(&leaf->header); nritems = btrfs_header_nritems(&leaf->header);
slot = path.slots[0]; slot = path->slots[0];
if (advance || slot >= nritems) { if (advance || slot >= nritems) {
if (slot >= nritems -1) { if (slot >= nritems -1) {
ret = btrfs_next_leaf(root, &path); ret = btrfs_next_leaf(root, path);
if (ret) if (ret)
break; break;
leaf = btrfs_buffer_leaf(path.nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
nritems = btrfs_header_nritems(&leaf->header); nritems = btrfs_header_nritems(&leaf->header);
slot = path.slots[0]; slot = path->slots[0];
} else { } else {
slot++; slot++;
path.slots[0]++; path->slots[0]++;
} }
} }
advance = 1; advance = 1;
@ -465,7 +486,8 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
} }
ret = 0; ret = 0;
err: err:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
mutex_unlock(&root->fs_info->fs_mutex); mutex_unlock(&root->fs_info->fs_mutex);
return ret; return ret;
} }
@ -548,26 +570,29 @@ static int btrfs_update_inode(struct btrfs_trans_handle *trans,
struct inode *inode) struct inode *inode)
{ {
struct btrfs_inode_item *inode_item; struct btrfs_inode_item *inode_item;
struct btrfs_path path; struct btrfs_path *path;
int ret; int ret;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
ret = btrfs_lookup_inode(trans, root, &path, inode->i_ino, 1); ret = btrfs_lookup_inode(trans, root, path, inode->i_ino, 1);
if (ret) { if (ret) {
if (ret > 0) if (ret > 0)
ret = -ENOENT; ret = -ENOENT;
goto failed; goto failed;
} }
inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
path.slots[0], path->slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
fill_inode_item(inode_item, inode); fill_inode_item(inode_item, inode);
btrfs_mark_buffer_dirty(path.nodes[0]); btrfs_mark_buffer_dirty(path->nodes[0]);
failed: failed:
btrfs_release_path(root, &path); btrfs_release_path(root, path);
btrfs_free_path(path);
check_inode(inode); check_inode(inode);
return 0; return 0;
} }
@ -799,38 +824,39 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
u64 extent_start = 0; u64 extent_start = 0;
u64 extent_end = 0; u64 extent_end = 0;
u64 objectid = inode->i_ino; u64 objectid = inode->i_ino;
struct btrfs_path path; struct btrfs_path *path;
struct btrfs_root *root = btrfs_sb(inode->i_sb); struct btrfs_root *root = btrfs_sb(inode->i_sb);
struct btrfs_trans_handle *trans = NULL; struct btrfs_trans_handle *trans = NULL;
struct btrfs_file_extent_item *item; struct btrfs_file_extent_item *item;
struct btrfs_leaf *leaf; struct btrfs_leaf *leaf;
struct btrfs_disk_key *found_key; struct btrfs_disk_key *found_key;
btrfs_init_path(&path); path = btrfs_alloc_path();
BUG_ON(!path);
btrfs_init_path(path);
if (create) if (create)
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
ret = btrfs_lookup_file_extent(trans, root, &path, ret = btrfs_lookup_file_extent(trans, root, path,
inode->i_ino, inode->i_ino,
iblock << inode->i_blkbits, 0); iblock << inode->i_blkbits, 0);
if (ret < 0) { if (ret < 0) {
btrfs_release_path(root, &path);
err = ret; err = ret;
goto out; goto out;
} }
if (ret != 0) { if (ret != 0) {
if (path.slots[0] == 0) { if (path->slots[0] == 0) {
btrfs_release_path(root, &path); btrfs_release_path(root, path);
goto allocate; goto allocate;
} }
path.slots[0]--; path->slots[0]--;
} }
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);
leaf = btrfs_buffer_leaf(path.nodes[0]); leaf = btrfs_buffer_leaf(path->nodes[0]);
blocknr = btrfs_file_extent_disk_blocknr(item); blocknr = btrfs_file_extent_disk_blocknr(item);
blocknr += btrfs_file_extent_offset(item); blocknr += btrfs_file_extent_offset(item);
@ -838,25 +864,23 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
if (ret == 0) { if (ret == 0) {
err = 0; err = 0;
map_bh(result, inode->i_sb, blocknr); map_bh(result, inode->i_sb, blocknr);
btrfs_release_path(root, &path);
goto out; goto out;
} }
/* are we inside the extent that was found? */ /* are we inside the extent that was found? */
found_key = &leaf->items[path.slots[0]].key; found_key = &leaf->items[path->slots[0]].key;
if (btrfs_disk_key_objectid(found_key) != objectid || if (btrfs_disk_key_objectid(found_key) != objectid ||
btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY) { btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY) {
extent_end = 0; extent_end = 0;
extent_start = 0; extent_start = 0;
btrfs_release_path(root, &path); btrfs_release_path(root, path);
goto allocate; goto allocate;
} }
extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key); extent_start = btrfs_disk_key_offset(&leaf->items[path->slots[0]].key);
extent_start = extent_start >> inode->i_blkbits; extent_start = extent_start >> inode->i_blkbits;
extent_start += btrfs_file_extent_offset(item); extent_start += btrfs_file_extent_offset(item);
extent_end = extent_start + btrfs_file_extent_num_blocks(item); extent_end = extent_start + btrfs_file_extent_num_blocks(item);
btrfs_release_path(root, &path);
if (iblock >= extent_start && iblock < extent_end) { if (iblock >= extent_start && iblock < extent_end) {
err = 0; err = 0;
map_bh(result, inode->i_sb, blocknr + iblock - extent_start); map_bh(result, inode->i_sb, blocknr + iblock - extent_start);
@ -880,6 +904,8 @@ allocate:
map_bh(result, inode->i_sb, blocknr); map_bh(result, inode->i_sb, blocknr);
out: out:
btrfs_release_path(root, path);
btrfs_free_path(path);
if (trans) if (trans)
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
return err; return err;