btrfs: Rework error handling of add_extent_mapping in __btrfs_alloc_chunk

Currently the code executes add_extent_mapping and if it is successful
it links the new mapping, it then proceeds to unlock the extent mapping
tree and check for failure and handle them. Instead, rework the code to
only perform a single check if add_extent_mapping has failed and handle
it, otherwise the code continues in a linear fashion. No functional
changes

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 533b417d9342fdc6aead656fb4fbbcfbec0a2be7..ac1e8686ba7815074adc50dc9ac7c66a04165df2 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4808,16 +4808,16 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
        em_tree = &info->mapping_tree.map_tree;
        write_lock(&em_tree->lock);
        ret = add_extent_mapping(em_tree, em, 0);
-       if (!ret) {
-               list_add_tail(&em->list, &trans->transaction->pending_chunks);
-               refcount_inc(&em->refs);
-       }
-       write_unlock(&em_tree->lock);
        if (ret) {
+               write_unlock(&em_tree->lock);
                free_extent_map(em);
                goto error;
        }
 
+       list_add_tail(&em->list, &trans->transaction->pending_chunks);
+       refcount_inc(&em->refs);
+       write_unlock(&em_tree->lock);
+
        ret = btrfs_make_block_group(trans, info, 0, type, start, num_bytes);
        if (ret)
                goto error_del_extent;