RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-05-01 23:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Merge alloc_reserved_tree_block2 and alloc_reserved_tree_block

Browse Source 
Now that delayed refs have been wired let's merge the two function. In
the process also remove one BUG_ON since alloc_reserved_tree_block's
callers can handle errors. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Nikolay Borisov 2018-08-16 15:09:25 +03:00 committed by David Sterba
parent 8bbb72cfc5
commit 43f14d06fd
1 changed files with 48 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
extent-tree.c
View File

@ -44,10 +44,6 @@ struct pending_extent_op {
int level; int level;
}; };
static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
u64 root_objectid, u64 generation,
u64 flags, struct btrfs_disk_key *key,
int level, struct btrfs_key *ins);
static int __free_extent(struct btrfs_trans_handle *trans, static int __free_extent(struct btrfs_trans_handle *trans,
u64 bytenr, u64 num_bytes, u64 parent, u64 bytenr, u64 num_bytes, u64 parent,
u64 root_objectid, u64 owner_objectid, u64 root_objectid, u64 owner_objectid,
@ -2528,16 +2524,22 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
static int alloc_reserved_tree_block2(struct btrfs_trans_handle *trans, static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
struct btrfs_delayed_ref_node *node, struct btrfs_delayed_ref_node *node,
struct btrfs_delayed_extent_op *extent_op) struct btrfs_delayed_extent_op *extent_op)
{ {
struct btrfs_delayed_tree_ref *ref = btrfs_delayed_node_to_tree_ref(node); struct btrfs_delayed_tree_ref *ref = btrfs_delayed_node_to_tree_ref(node);
struct btrfs_key ins;
bool skinny_metadata = btrfs_fs_incompat(trans->fs_info, SKINNY_METADATA); bool skinny_metadata = btrfs_fs_incompat(trans->fs_info, SKINNY_METADATA);
int ret; struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_extent_item *extent_item;
struct btrfs_extent_inline_ref *iref;
struct extent_buffer *leaf;
struct btrfs_path *path;
struct btrfs_key ins;
u32 size = sizeof(*extent_item) + sizeof(*iref);
u64 start, end; u64 start, end;
int ret;
ins.objectid = node->bytenr; ins.objectid = node->bytenr;
if (skinny_metadata) { if (skinny_metadata) {
@ -2546,6 +2548,8 @@ static int alloc_reserved_tree_block2(struct btrfs_trans_handle *trans,
} else { } else {
ins.offset = node->num_bytes; ins.offset = node->num_bytes;
ins.type = BTRFS_EXTENT_ITEM_KEY; ins.type = BTRFS_EXTENT_ITEM_KEY;
size += sizeof(struct btrfs_tree_block_info);
} }
if (ref->root == BTRFS_EXTENT_TREE_OBJECTID) { if (ref->root == BTRFS_EXTENT_TREE_OBJECTID) {
@ -2557,9 +2561,42 @@ static int alloc_reserved_tree_block2(struct btrfs_trans_handle *trans,
ASSERT(end == node->bytenr + node->num_bytes - 1); ASSERT(end == node->bytenr + node->num_bytes - 1);
} }
ret = alloc_reserved_tree_block(trans, ref->root, trans->transid, path = btrfs_alloc_path();
extent_op->flags_to_set, if (!path)
&extent_op->key, ref->level, &ins); return -ENOMEM;
ret = btrfs_insert_empty_item(trans, fs_info->extent_root, path,
&ins, size);
if (ret)
return ret;
leaf = path->nodes[0];
extent_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_extent_item);
btrfs_set_extent_refs(leaf, extent_item, 1);
btrfs_set_extent_generation(leaf, extent_item, trans->transid);
btrfs_set_extent_flags(leaf, extent_item,
extent_op->flags_to_set |
BTRFS_EXTENT_FLAG_TREE_BLOCK);
if (skinny_metadata) {
iref = (struct btrfs_extent_inline_ref *)(extent_item + 1);
} else {
struct btrfs_tree_block_info *block_info;
block_info = (struct btrfs_tree_block_info *)(extent_item + 1);
btrfs_set_tree_block_key(leaf, block_info, &extent_op->key);
btrfs_set_tree_block_level(leaf, block_info, ref->level);
iref = (struct btrfs_extent_inline_ref *)(block_info + 1);
}
btrfs_set_extent_inline_ref_type(leaf, iref, BTRFS_TREE_BLOCK_REF_KEY);
btrfs_set_extent_inline_ref_offset(leaf, iref, ref->root);
btrfs_mark_buffer_dirty(leaf);
btrfs_free_path(path);
ret = update_block_group(fs_info, ins.objectid, fs_info->nodesize, 1,
0);
if (ref->root == BTRFS_EXTENT_TREE_OBJECTID) { if (ref->root == BTRFS_EXTENT_TREE_OBJECTID) {
clear_extent_bits(&trans->fs_info->extent_ins, start, end, clear_extent_bits(&trans->fs_info->extent_ins, start, end,
@ -2569,60 +2606,6 @@ static int alloc_reserved_tree_block2(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans,
u64 root_objectid, u64 generation,
u64 flags, struct btrfs_disk_key *key,
int level, struct btrfs_key *ins)
{
int ret;
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_extent_item *extent_item;
struct btrfs_tree_block_info *block_info;
struct btrfs_extent_inline_ref *iref;
struct btrfs_path *path;
struct extent_buffer *leaf;
u32 size = sizeof(*extent_item) + sizeof(*iref);
int skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA);
if (!skinny_metadata)
size += sizeof(*block_info);
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
ret = btrfs_insert_empty_item(trans, fs_info->extent_root, path,
ins, size);
BUG_ON(ret);
leaf = path->nodes[0];
extent_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_extent_item);
btrfs_set_extent_refs(leaf, extent_item, 1);
btrfs_set_extent_generation(leaf, extent_item, generation);
btrfs_set_extent_flags(leaf, extent_item,
flags | BTRFS_EXTENT_FLAG_TREE_BLOCK);
if (skinny_metadata) {
iref = (struct btrfs_extent_inline_ref *)(extent_item + 1);
} else {
block_info = (struct btrfs_tree_block_info *)(extent_item + 1);
btrfs_set_tree_block_key(leaf, block_info, key);
btrfs_set_tree_block_level(leaf, block_info, level);
iref = (struct btrfs_extent_inline_ref *)(block_info + 1);
}
btrfs_set_extent_inline_ref_type(leaf, iref, BTRFS_TREE_BLOCK_REF_KEY);
btrfs_set_extent_inline_ref_offset(leaf, iref, root_objectid);
btrfs_mark_buffer_dirty(leaf);
btrfs_free_path(path);
ret = update_block_group(fs_info, ins->objectid, fs_info->nodesize,
1, 0);
return ret;
}
static int alloc_tree_block(struct btrfs_trans_handle *trans, static int alloc_tree_block(struct btrfs_trans_handle *trans,
struct btrfs_root *root, u64 num_bytes, struct btrfs_root *root, u64 num_bytes,
u64 root_objectid, u64 generation, u64 root_objectid, u64 generation,
@ -4171,7 +4154,7 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans,
} }
if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) { if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) {
BUG_ON(!extent_op || !extent_op->update_flags); BUG_ON(!extent_op || !extent_op->update_flags);
ret = alloc_reserved_tree_block2(trans, node, extent_op); ret = alloc_reserved_tree_block(trans, node, extent_op);
} else if (node->action == BTRFS_DROP_DELAYED_REF) { } else if (node->action == BTRFS_DROP_DELAYED_REF) {
struct btrfs_delayed_tree_ref *ref = btrfs_delayed_node_to_tree_ref(node); struct btrfs_delayed_tree_ref *ref = btrfs_delayed_node_to_tree_ref(node);
ret = __free_extent(trans, node->bytenr, node->num_bytes, ret = __free_extent(trans, node->bytenr, node->num_bytes,