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

Commit db5b493a authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by root
Browse files

Btrfs: cleanup some BUG_ON() 



This patch changes some BUG_ON() to the error return.
(but, most callers still use BUG_ON())

Signed-off-by: default avatarTsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1abe9b8a

fs/btrfs/ctree.c

+2 −1
Original line number Diff line number Diff line
@@ -3709,7 +3709,8 @@ int btrfs_insert_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	unsigned long ptr;



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path)

		return -ENOMEM;

	ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);

	if (!ret) {

		leaf = path->nodes[0];

fs/btrfs/disk-io.c

+4 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,10 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, 
		     root, fs_info, location->objectid);



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path) {

		kfree(root);

		return ERR_PTR(-ENOMEM);

	}

	ret = btrfs_search_slot(NULL, tree_root, location, path, 0, 0);

	if (ret == 0) {

		l = path->nodes[0];

fs/btrfs/extent-tree.c

+18 −7
Original line number Diff line number Diff line
@@ -5463,7 +5463,8 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, 
	size = sizeof(*extent_item) + btrfs_extent_inline_ref_size(type);



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path)

		return -ENOMEM;



	path->leave_spinning = 1;

	ret = btrfs_insert_empty_item(trans, fs_info->extent_root, path,
@@ -6457,10 +6458,14 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, 
	BUG_ON(root->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID);



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path)

		return -ENOMEM;



	wc = kzalloc(sizeof(*wc), GFP_NOFS);

	BUG_ON(!wc);

	if (!wc) {

		btrfs_free_path(path);

		return -ENOMEM;

	}



	btrfs_assert_tree_locked(parent);

	parent_level = btrfs_header_level(parent);
@@ -6918,7 +6923,11 @@ static noinline int get_new_locations(struct inode *reloc_inode, 
	}



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path) {

		if (exts != *extents)

			kfree(exts);

		return -ENOMEM;

	}



	cur_pos = extent_key->objectid - offset;

	last_byte = extent_key->objectid + extent_key->offset;
@@ -7442,7 +7451,8 @@ static noinline int replace_extents_in_leaf(struct btrfs_trans_handle *trans, 
	int ret;



	new_extent = kmalloc(sizeof(*new_extent), GFP_NOFS);

	BUG_ON(!new_extent);

	if (!new_extent)

		return -ENOMEM;



	ref = btrfs_lookup_leaf_ref(root, leaf->start);

	BUG_ON(!ref);
@@ -7647,7 +7657,8 @@ static noinline int init_reloc_tree(struct btrfs_trans_handle *trans, 
		return 0;



	root_item = kmalloc(sizeof(*root_item), GFP_NOFS);

	BUG_ON(!root_item);

	if (!root_item)

		return -ENOMEM;



	ret = btrfs_copy_root(trans, root, root->commit_root,

			      &eb, BTRFS_TREE_RELOC_OBJECTID);
@@ -7673,7 +7684,7 @@ static noinline int init_reloc_tree(struct btrfs_trans_handle *trans, 


	reloc_root = btrfs_read_fs_root_no_radix(root->fs_info->tree_root,

						 &root_key);

	BUG_ON(!reloc_root);

	BUG_ON(IS_ERR(reloc_root));

	reloc_root->last_trans = trans->transid;

	reloc_root->commit_root = NULL;

	reloc_root->ref_tree = &root->fs_info->reloc_ref_tree;

fs/btrfs/file-item.c

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans, 
	struct extent_buffer *leaf;



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path)

		return -ENOMEM;

	file_key.objectid = objectid;

	file_key.offset = pos;

	btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);

fs/btrfs/inode-map.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid) 
	int slot;



	path = btrfs_alloc_path();

	BUG_ON(!path);

	if (!path)

		return -ENOMEM;



	search_key.objectid = BTRFS_LAST_FREE_OBJECTID;

	search_key.type = -1;