diff options
| author | Mark Fasheh <mfasheh@suse.de> | 2011-09-08 17:40:01 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2012-03-22 01:45:39 +0100 |
| commit | 3acd395317f22b4346a139571cd4723408c5d4af (patch) | |
| tree | 2ccb38cbf20effabef8ff577be03f1414a912e32 | |
| parent | 1dd4602fa74273c28b3577a58aa389f330e9a0dc (diff) | |
| download | linux-stable-3acd395317f22b4346a139571cd4723408c5d4af.tar.gz linux-stable-3acd395317f22b4346a139571cd4723408c5d4af.tar.bz2 linux-stable-3acd395317f22b4346a139571cd4723408c5d4af.zip | |
btrfs: Remove BUG_ON from __finish_chunk_alloc()
btrfs_alloc_chunk() unconditionally BUGs on any error returned from
__finish_chunk_alloc() so there's no need for two BUG_ON lines. Remove the
one from __finish_chunk_alloc().
Signed-off-by: Mark Fasheh <mfasheh@suse.de>
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index f002973959d0..394bf15ea18c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3383,7 +3383,8 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans, device = map->stripes[index].dev; device->bytes_used += stripe_size; ret = btrfs_update_device(trans, device); - BUG_ON(ret); + if (ret) + goto out_free; index++; } @@ -3430,6 +3431,7 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans, item_size); } +out_free: kfree(chunk); return ret; } |