diff options
| author |   Nikolay Borisov <nborisov@suse.com> | 2017-08-21 12:43:49 +0300 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2017-10-30 12:27:56 +0100 |
| commit | 1efb72a3c3ea8e430d1984774692ecbe3235600a (patch) | |
| tree | a1931a745d6a5a70bd15239f35bd57849bf72e50 | |
| parent | btrfs: Remove unused parameter from check_direct_IO (diff) | |
| download | linux-dev-1efb72a3c3ea8e430d1984774692ecbe3235600a.tar.xz linux-dev-1efb72a3c3ea8e430d1984774692ecbe3235600a.zip | |
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>
| -rw-r--r-- | fs/btrfs/volumes.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 533b417d9342..ac1e8686ba78 100644 --- 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; |