Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ed1d16e authored by Mark Fasheh's avatar Mark Fasheh Committed by David Sterba
Browse files

btrfs: Don't BUG_ON errors in __finish_chunk_alloc() 



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: default avatarMark Fasheh <mfasheh@suse.de>
parent 0678b618

fs/btrfs/volumes.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

}



/*