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

Commit 1cd30799 authored by Tsutomu Itoh's avatar Tsutomu Itoh Committed by Chris Mason
Browse files

Btrfs: BUG_ON is deleted from the caller of btrfs_truncate_item & btrfs_extend_item 



Currently, btrfs_truncate_item and btrfs_extend_item returns only 0.
So, the check by BUG_ON in the caller is unnecessary.

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

fs/btrfs/ctree.c

+2 −6
Original line number Diff line number Diff line
@@ -3216,7 +3216,6 @@ int btrfs_truncate_item(struct btrfs_trans_handle *trans, 
			struct btrfs_path *path,

			u32 new_size, int from_end)

{

	int ret = 0;

	int slot;

	struct extent_buffer *leaf;

	struct btrfs_item *item;
@@ -3314,12 +3313,11 @@ int btrfs_truncate_item(struct btrfs_trans_handle *trans, 
	btrfs_set_item_size(leaf, item, new_size);

	btrfs_mark_buffer_dirty(leaf);



	ret = 0;

	if (btrfs_leaf_free_space(root, leaf) < 0) {

		btrfs_print_leaf(root, leaf);

		BUG();

	}

	return ret;

	return 0;

}



/*
@@ -3329,7 +3327,6 @@ int btrfs_extend_item(struct btrfs_trans_handle *trans, 
		      struct btrfs_root *root, struct btrfs_path *path,

		      u32 data_size)

{

	int ret = 0;

	int slot;

	struct extent_buffer *leaf;

	struct btrfs_item *item;
@@ -3394,12 +3391,11 @@ int btrfs_extend_item(struct btrfs_trans_handle *trans, 
	btrfs_set_item_size(leaf, item, old_size + data_size);

	btrfs_mark_buffer_dirty(leaf);



	ret = 0;

	if (btrfs_leaf_free_space(root, leaf) < 0) {

		btrfs_print_leaf(root, leaf);

		BUG();

	}

	return ret;

	return 0;

}



/*

fs/btrfs/dir-item.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle 
		if (di)

			return ERR_PTR(-EEXIST);

		ret = btrfs_extend_item(trans, root, path, data_size);

		WARN_ON(ret > 0);

	}

	if (ret < 0)

		return ERR_PTR(ret);

fs/btrfs/extent-tree.c

+0 −3
Original line number Diff line number Diff line
@@ -947,7 +947,6 @@ static int convert_extent_item_v0(struct btrfs_trans_handle *trans, 
	BUG_ON(ret);



	ret = btrfs_extend_item(trans, root, path, new_size);

	BUG_ON(ret);



	leaf = path->nodes[0];

	item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item);
@@ -1555,7 +1554,6 @@ int setup_inline_extent_backref(struct btrfs_trans_handle *trans, 
	size = btrfs_extent_inline_ref_size(type);



	ret = btrfs_extend_item(trans, root, path, size);

	BUG_ON(ret);



	ei = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_extent_item);

	refs = btrfs_extent_refs(leaf, ei);
@@ -1684,7 +1682,6 @@ int update_inline_extent_backref(struct btrfs_trans_handle *trans, 
					      end - ptr - size);

		item_size -= size;

		ret = btrfs_truncate_item(trans, root, path, item_size, 1);

		BUG_ON(ret);

	}

	btrfs_mark_buffer_dirty(leaf);

	return 0;

fs/btrfs/file-item.c

+0 −3
Original line number Diff line number Diff line
@@ -495,7 +495,6 @@ static noinline int truncate_one_csum(struct btrfs_trans_handle *trans, 
		u32 new_size = (bytenr - key->offset) >> blocksize_bits;

		new_size *= csum_size;

		ret = btrfs_truncate_item(trans, root, path, new_size, 1);

		BUG_ON(ret);

	} else if (key->offset >= bytenr && csum_end > end_byte &&

		   end_byte > key->offset) {

		/*
@@ -508,7 +507,6 @@ static noinline int truncate_one_csum(struct btrfs_trans_handle *trans, 
		new_size *= csum_size;



		ret = btrfs_truncate_item(trans, root, path, new_size, 0);

		BUG_ON(ret);



		key->offset = end_byte;

		ret = btrfs_set_item_key_safe(trans, root, path, key);
@@ -763,7 +761,6 @@ again: 
			goto insert;



		ret = btrfs_extend_item(trans, root, path, diff);

		BUG_ON(ret);

		goto csum;

	}

fs/btrfs/inode-item.c

+0 −2
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, 
			      item_size - (ptr + sub_item_len - item_start));

	ret = btrfs_truncate_item(trans, root, path,

				  item_size - sub_item_len, 1);

	BUG_ON(ret);

out:

	btrfs_free_path(path);

	return ret;
@@ -167,7 +166,6 @@ int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans, 


		old_size = btrfs_item_size_nr(path->nodes[0], path->slots[0]);

		ret = btrfs_extend_item(trans, root, path, ins_len);

		BUG_ON(ret);

		ref = btrfs_item_ptr(path->nodes[0], path->slots[0],

				     struct btrfs_inode_ref);

		ref = (struct btrfs_inode_ref *)((unsigned long)ref + old_size);