diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-05-21 12:27:23 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-05-29 18:12:57 +0200 |
| commit | d4b20733d203eea307986bd0502ba8d54afc2891 (patch) | |
| tree | add57f9abc7c662f8cf158698bf43bd40eeeb3af | |
| parent | 21ebfbe7e06cafb05c41cc39b058be35acb6c5da (diff) | |
| download | linux-stable-d4b20733d203eea307986bd0502ba8d54afc2891.tar.gz linux-stable-d4b20733d203eea307986bd0502ba8d54afc2891.tar.bz2 linux-stable-d4b20733d203eea307986bd0502ba8d54afc2891.zip | |
btrfs: Streamline shared ref check in alloc_reserved_tree_block
Instead of setting "parent" to ref->parent only when dealing with
a shared ref and subsequently performing another check to see
if (parent > 0), check the "node->type" directly and act accordingly.
This makes the code more streamline. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 1e666961f0e4..c25308722e81 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -8143,17 +8143,11 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, struct btrfs_delayed_tree_ref *ref; u32 size = sizeof(*extent_item) + sizeof(*iref); u64 num_bytes; - u64 parent; u64 flags = extent_op->flags_to_set; bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA); ref = btrfs_delayed_node_to_tree_ref(node); - if (node->type == BTRFS_SHARED_BLOCK_REF_KEY) - parent = ref->parent; - else - parent = 0; - extent_key.objectid = node->bytenr; if (skinny_metadata) { extent_key.offset = ref->level; @@ -8202,11 +8196,11 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, iref = (struct btrfs_extent_inline_ref *)(block_info + 1); } - if (parent > 0) { + if (node->type == BTRFS_SHARED_BLOCK_REF_KEY) { BUG_ON(!(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)); btrfs_set_extent_inline_ref_type(leaf, iref, BTRFS_SHARED_BLOCK_REF_KEY); - btrfs_set_extent_inline_ref_offset(leaf, iref, parent); + btrfs_set_extent_inline_ref_offset(leaf, iref, ref->parent); } else { btrfs_set_extent_inline_ref_type(leaf, iref, BTRFS_TREE_BLOCK_REF_KEY); |