Skip to content

Commit

Permalink
btrfs: Don't BUG_ON errors in __finish_chunk_alloc()
Browse files Browse the repository at this point in the history
All callers of __finish_chunk_alloc() BUG_ON() return value, so it's trivial
for us to always bubble up any errors caught in __finish_chunk_alloc() to be
caught there.

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
  • Loading branch information
Mark Fasheh authored and David Sterba committed Mar 22, 2012
1 parent 0678b61 commit 4ed1d16
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -3417,16 +3417,18 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans,
key.offset = chunk_offset;

ret = btrfs_insert_item(trans, chunk_root, &key, chunk, item_size);
BUG_ON(ret);

if (map->type & BTRFS_BLOCK_GROUP_SYSTEM) {
if (ret == 0 && map->type & BTRFS_BLOCK_GROUP_SYSTEM) {
/*
* TODO: Cleanup of inserted chunk root in case of
* failure.
*/
ret = btrfs_add_system_chunk(chunk_root, &key, chunk,
item_size);
BUG_ON(ret);
}

kfree(chunk);
return 0;
return ret;
}

/*
Expand Down

0 comments on commit 4ed1d16

Please sign in to comment.