btrfs: Streamline shared ref check in alloc_reserved_tree_block
authorNikolay Borisov <nborisov@suse.com>
Mon, 21 May 2018 09:27:23 +0000 (12:27 +0300)
committerDavid Sterba <dsterba@suse.com>
Tue, 29 May 2018 16:12:57 +0000 (18:12 +0200)
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>
fs/btrfs/extent-tree.c

index 1e666961f0e42a70ee60b2ce958d6a404c798a83..c25308722e81cdb56503f60697b3f7bb27392a19 100644 (file)
@@ -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);