diff options
author | Mark Fasheh <mfasheh@suse.com> | 2011-07-12 13:57:59 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2011-07-25 17:34:54 -0400 |
commit | 92b8e897f6e7ba4aa10037ebd8186f85d39330d0 (patch) | |
tree | 54988ee036e1dfe3297b0b4e0dfe6323568bf02e /fs/btrfs/extent-tree.c | |
parent | 17e9f796bd92cddec17d781c459376f82340fa44 (diff) |
btrfs: Don't BUG_ON alloc_path errors in find_next_chunk
I also removed the BUG_ON from error return of find_next_chunk in
init_first_rw_device(). It turns out that the only caller of
init_first_rw_device() also BUGS on any nonzero return so no actual behavior
change has occurred here.
do_chunk_alloc() also needed an update since it calls btrfs_alloc_chunk()
which can now return -ENOMEM. Instead of setting space_info->full on any
error from btrfs_alloc_chunk() I catch and return every error value _except_
-ENOSPC. Thanks goes to Tsutomu Itoh for pointing that issue out.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index aa91773fe31b..f6af4236e59b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3277,6 +3277,9 @@ again: | |||
3277 | } | 3277 | } |
3278 | 3278 | ||
3279 | ret = btrfs_alloc_chunk(trans, extent_root, flags); | 3279 | ret = btrfs_alloc_chunk(trans, extent_root, flags); |
3280 | if (ret < 0 && ret != -ENOSPC) | ||
3281 | goto out; | ||
3282 | |||
3280 | spin_lock(&space_info->lock); | 3283 | spin_lock(&space_info->lock); |
3281 | if (ret) | 3284 | if (ret) |
3282 | space_info->full = 1; | 3285 | space_info->full = 1; |
@@ -3286,6 +3289,7 @@ again: | |||
3286 | space_info->force_alloc = CHUNK_ALLOC_NO_FORCE; | 3289 | space_info->force_alloc = CHUNK_ALLOC_NO_FORCE; |
3287 | space_info->chunk_alloc = 0; | 3290 | space_info->chunk_alloc = 0; |
3288 | spin_unlock(&space_info->lock); | 3291 | spin_unlock(&space_info->lock); |
3292 | out: | ||
3289 | mutex_unlock(&extent_root->fs_info->chunk_mutex); | 3293 | mutex_unlock(&extent_root->fs_info->chunk_mutex); |
3290 | return ret; | 3294 | return ret; |
3291 | } | 3295 | } |