Commit 57f1642e authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Consolidate error checking for btrfs_alloc_chunk

The second if is really a subcase of ret being less than 0. So
introduce a generic if (ret < 0) check, and inside have another if
which explicitly handles the -ENOSPC and any other errors. No
functional changes.
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1e7a1421
...@@ -4681,12 +4681,14 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, ...@@ -4681,12 +4681,14 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
trans->allocating_chunk = false; trans->allocating_chunk = false;
spin_lock(&space_info->lock); spin_lock(&space_info->lock);
if (ret < 0 && ret != -ENOSPC) if (ret < 0) {
goto out; if (ret == -ENOSPC)
if (ret)
space_info->full = 1; space_info->full = 1;
else else
goto out;
} else {
ret = 1; ret = 1;
}
space_info->force_alloc = CHUNK_ALLOC_NO_FORCE; space_info->force_alloc = CHUNK_ALLOC_NO_FORCE;
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment