Commit 57f1642e authored Apr 11, 2018 by Nikolay Borisov Committed by David Sterba May 28, 2018

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: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 1e7a1421

fs/btrfs/extent-tree.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -4681,12 +4681,14 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans,
		trans->allocating_chunk = false;

		spin_lock(&space_info->lock);
		if (ret < 0 && ret != -ENOSPC)
		goto out;
		if (ret)
		if (ret < 0) {
		if (ret == -ENOSPC)
		space_info->full = 1;
		else
		goto out;
		} else {
		ret = 1;
		}

		space_info->force_alloc = CHUNK_ALLOC_NO_FORCE;
		out: