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

Commit 62d1f9fe authored by David Sterba's avatar David Sterba
Browse files

btrfs: remove trivial helper btrfs_find_tree_block 



During the time, the function has been shrunk to the point that it just
calls find_extent_buffer, just passing the parameters.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b917bb38

fs/btrfs/ctree.c

+5 −5
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans, 
			continue;

		}



		cur = btrfs_find_tree_block(root->fs_info, blocknr);

		cur = find_extent_buffer(root->fs_info, blocknr);

		if (cur)

			uptodate = btrfs_buffer_uptodate(cur, gen, 0);

		else
@@ -2255,7 +2255,7 @@ static void reada_for_search(struct btrfs_root *root, 


	search = btrfs_node_blockptr(node, slot);

	blocksize = root->nodesize;

	eb = btrfs_find_tree_block(root->fs_info, search);

	eb = find_extent_buffer(root->fs_info, search);

	if (eb) {

		free_extent_buffer(eb);

		return;
@@ -2314,7 +2314,7 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	if (slot > 0) {

		block1 = btrfs_node_blockptr(parent, slot - 1);

		gen = btrfs_node_ptr_generation(parent, slot - 1);

		eb = btrfs_find_tree_block(root->fs_info, block1);

		eb = find_extent_buffer(root->fs_info, block1);

		/*

		 * if we get -eagain from btrfs_buffer_uptodate, we

		 * don't want to return eagain here.  That will loop
@@ -2327,7 +2327,7 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	if (slot + 1 < nritems) {

		block2 = btrfs_node_blockptr(parent, slot + 1);

		gen = btrfs_node_ptr_generation(parent, slot + 1);

		eb = btrfs_find_tree_block(root->fs_info, block2);

		eb = find_extent_buffer(root->fs_info, block2);

		if (eb && btrfs_buffer_uptodate(eb, gen, 1) != 0)

			block2 = 0;

		free_extent_buffer(eb);
@@ -2445,7 +2445,7 @@ read_block_for_search(struct btrfs_trans_handle *trans, 
	blocknr = btrfs_node_blockptr(b, slot);

	gen = btrfs_node_ptr_generation(b, slot);



	tmp = btrfs_find_tree_block(root->fs_info, blocknr);

	tmp = find_extent_buffer(root->fs_info, blocknr);

	if (tmp) {

		/* first we do an atomic uptodate check */

		if (btrfs_buffer_uptodate(tmp, gen, 1) > 0) {

fs/btrfs/disk-io.c

+1 −7
Original line number Diff line number Diff line
@@ -1191,12 +1191,6 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, 
	return 0;

}



struct extent_buffer *btrfs_find_tree_block(struct btrfs_fs_info *fs_info,

					    u64 bytenr)

{

	return find_extent_buffer(fs_info, bytenr);

}



struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						 u64 bytenr)

{
@@ -4452,7 +4446,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root, 


		clear_extent_bits(dirty_pages, start, end, mark);

		while (start <= end) {

			eb = btrfs_find_tree_block(root->fs_info, start);

			eb = find_extent_buffer(root->fs_info, start);

			start += root->nodesize;

			if (!eb)

				continue;

fs/btrfs/disk-io.h

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ struct buffer_head *btrfs_read_dev_super(struct block_device *bdev); 
int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num,

			struct buffer_head **bh_ret);

int btrfs_commit_super(struct btrfs_root *root);

struct extent_buffer *btrfs_find_tree_block(struct btrfs_fs_info *fs_info,

					    u64 bytenr);

struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,

				      struct btrfs_key *location);

int btrfs_init_fs_root(struct btrfs_root *root);

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -8866,7 +8866,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 
	bytenr = btrfs_node_blockptr(path->nodes[level], path->slots[level]);

	blocksize = root->nodesize;



	next = btrfs_find_tree_block(root->fs_info, bytenr);

	next = find_extent_buffer(root->fs_info, bytenr);

	if (!next) {

		next = btrfs_find_create_tree_block(root, bytenr);

		if (IS_ERR(next))