Commit 3fbaf258 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: pass the owner_root and level to alloc_extent_buffer 



Now that we've plumbed all of the callers to have the owner root and the
level, plumb it down into alloc_extent_buffer().

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5d81230b

fs/btrfs/disk-io.c

+4 −3
Original line number Diff line number Diff line
@@ -955,11 +955,12 @@ static const struct address_space_operations btree_aops = { 


struct extent_buffer *btrfs_find_create_tree_block(

						struct btrfs_fs_info *fs_info,

						u64 bytenr)

						u64 bytenr, u64 owner_root,

						int level)

{

	if (btrfs_is_testing(fs_info))

		return alloc_test_extent_buffer(fs_info, bytenr);

	return alloc_extent_buffer(fs_info, bytenr);

	return alloc_extent_buffer(fs_info, bytenr, owner_root, level);

}



/*
@@ -978,7 +979,7 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, 
	struct extent_buffer *buf = NULL;

	int ret;



	buf = btrfs_find_create_tree_block(fs_info, bytenr);

	buf = btrfs_find_create_tree_block(fs_info, bytenr, owner_root, level);

	if (IS_ERR(buf))

		return buf;

fs/btrfs/disk-io.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ struct extent_buffer *read_tree_block(struct btrfs_fs_info *fs_info, u64 bytenr, 
				      int level, struct btrfs_key *first_key);

struct extent_buffer *btrfs_find_create_tree_block(

						struct btrfs_fs_info *fs_info,

						u64 bytenr);

						u64 bytenr, u64 owner_root,

						int level);

void btrfs_clean_tree_block(struct extent_buffer *buf);

int __cold open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

fs/btrfs/extent-tree.c

+3 −2
Original line number Diff line number Diff line
@@ -4617,7 +4617,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
	struct btrfs_fs_info *fs_info = root->fs_info;

	struct extent_buffer *buf;



	buf = btrfs_find_create_tree_block(fs_info, bytenr);

	buf = btrfs_find_create_tree_block(fs_info, bytenr, owner, level);

	if (IS_ERR(buf))

		return buf;
@@ -5018,7 +5018,8 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, 


	next = find_extent_buffer(fs_info, bytenr);

	if (!next) {

		next = btrfs_find_create_tree_block(fs_info, bytenr);

		next = btrfs_find_create_tree_block(fs_info, bytenr,

				root->root_key.objectid, level - 1);

		if (IS_ERR(next))

			return PTR_ERR(next);

fs/btrfs/extent_io.c

+8 −4
Original line number Diff line number Diff line
@@ -5180,7 +5180,7 @@ struct extent_buffer *alloc_test_extent_buffer(struct btrfs_fs_info *fs_info, 
#endif



struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,

					  u64 start)

					  u64 start, u64 owner_root, int level)

{

	unsigned long len = fs_info->nodesize;

	int num_pages;
@@ -6128,19 +6128,21 @@ int try_release_extent_buffer(struct page *page) 
 * btrfs_readahead_tree_block - attempt to readahead a child block

 * @fs_info:	the fs_info

 * @bytenr:	bytenr to read

 * @owner_root: objectid of the root that owns this eb

 * @gen:	generation for the uptodate check, can be 0

 * @level:	level for the eb

 *

 * Attempt to readahead a tree block at @bytenr.  If @gen is 0 then we do a

 * normal uptodate check of the eb, without checking the generation.  If we have

 * to read the block we will not block on anything.

 */

void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,

				u64 bytenr, u64 gen)

				u64 bytenr, u64 owner_root, u64 gen, int level)

{

	struct extent_buffer *eb;

	int ret;



	eb = btrfs_find_create_tree_block(fs_info, bytenr);

	eb = btrfs_find_create_tree_block(fs_info, bytenr, owner_root, level);

	if (IS_ERR(eb))

		return;
@@ -6168,5 +6170,7 @@ void btrfs_readahead_node_child(struct extent_buffer *node, int slot) 
{

	btrfs_readahead_tree_block(node->fs_info,

				   btrfs_node_blockptr(node, slot),

				   btrfs_node_ptr_generation(node, slot));

				   btrfs_header_owner(node),

				   btrfs_node_ptr_generation(node, slot),

				   btrfs_header_level(node) - 1);

}

fs/btrfs/extent_io.h

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int extent_fiemap(struct btrfs_inode *inode, struct fiemap_extent_info *fieinfo, 
void set_page_extent_mapped(struct page *page);



struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,

					  u64 start);

					  u64 start, u64 owner_root, int level);

struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						  u64 start, unsigned long len);

struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
@@ -199,7 +199,7 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int wait, 
			     int mirror_num);

void wait_on_extent_buffer_writeback(struct extent_buffer *eb);

void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,

				u64 bytenr, u64 gen);

				u64 bytenr, u64 owner_root, u64 gen, int level);

void btrfs_readahead_node_child(struct extent_buffer *node, int slot);



static inline int num_extent_pages(const struct extent_buffer *eb)