diff options
| author |   Nikolay Borisov <nborisov@suse.com> | 2018-04-11 11:21:19 +0300 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-05-28 18:07:16 +0200 |
| commit | 57f1642ec36ac7c3d54f317a2f4882f39aa9ded1 (patch) | |
| tree | 282ee278af32801674291de04fbab6ad5895aa42 /fs/btrfs/extent-tree.c | |
| parent | btrfs: Fix lock release order (diff) | |
| download | linux-dev-57f1642ec36ac7c3d54f317a2f4882f39aa9ded1.tar.xz linux-dev-57f1642ec36ac7c3d54f317a2f4882f39aa9ded1.zip | |
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>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index cd2f5220577f..686d23727662 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -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: |