redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Nikolay Borisov 2018-04-11 11:21:19 +03:00 committed by David Sterba
parent 1e7a14211b
commit 57f1642ec3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/extent-tree.c
View File

@ -4681,12 +4681,14 @@ again:
trans->allocating_chunk = false;
spin_lock(&space_info->lock);
if (ret < 0 && ret != -ENOSPC)
goto out;
if (ret)
space_info->full = 1;
else
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: