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

Commit d3e46fea authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink blocksize parameter to readahead_tree_block 



All callers pass nodesize.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 9627aeee

fs/btrfs/ctree.c

+3 −5
Original line number Diff line number Diff line
@@ -2282,7 +2282,7 @@ static void reada_for_search(struct btrfs_root *root, 
		if ((search <= target && target - search <= 65536) ||

		    (search > target && search - target <= 65536)) {

			gen = btrfs_node_ptr_generation(node, nr);

			readahead_tree_block(root, search, blocksize);

			readahead_tree_block(root, search);

			nread += blocksize;

		}

		nscan++;
@@ -2301,7 +2301,6 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	u64 gen;

	u64 block1 = 0;

	u64 block2 = 0;

	int blocksize;



	parent = path->nodes[level + 1];

	if (!parent)
@@ -2309,7 +2308,6 @@ static noinline void reada_for_balance(struct btrfs_root *root, 


	nritems = btrfs_header_nritems(parent);

	slot = path->slots[level + 1];

	blocksize = root->nodesize;



	if (slot > 0) {

		block1 = btrfs_node_blockptr(parent, slot - 1);
@@ -2334,9 +2332,9 @@ static noinline void reada_for_balance(struct btrfs_root *root, 
	}



	if (block1)

		readahead_tree_block(root, block1, blocksize);

		readahead_tree_block(root, block1);

	if (block2)

		readahead_tree_block(root, block2, blocksize);

		readahead_tree_block(root, block2);

}

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -1073,12 +1073,12 @@ static const struct address_space_operations btree_aops = { 
	.set_page_dirty = btree_set_page_dirty,

};



void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)

void readahead_tree_block(struct btrfs_root *root, u64 bytenr)

{

	struct extent_buffer *buf = NULL;

	struct inode *btree_inode = root->fs_info->btree_inode;



	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

	buf = btrfs_find_create_tree_block(root, bytenr, root->nodesize);

	if (!buf)

		return;

	read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct btrfs_fs_devices; 


struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

				      u64 parent_transid);

void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize);

void readahead_tree_block(struct btrfs_root *root, u64 bytenr);

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,

			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -7485,7 +7485,7 @@ static noinline void reada_walk_down(struct btrfs_trans_handle *trans, 
				continue;

		}

reada:

		readahead_tree_block(root, bytenr, blocksize);

		readahead_tree_block(root, bytenr);

		nread++;

	}

	wc->reada_slot = slot;

fs/btrfs/relocation.c

+1 −2
Original line number Diff line number Diff line
@@ -2965,8 +2965,7 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, 
	while (rb_node) {

		block = rb_entry(rb_node, struct tree_block, rb_node);

		if (!block->key_ready)

			readahead_tree_block(rc->extent_root, block->bytenr,

					block->key.objectid);

			readahead_tree_block(rc->extent_root, block->bytenr);

		rb_node = rb_next(rb_node);

	}