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

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

btrfs: sink blocksize parameter to reada_tree_block_flagged 



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

fs/btrfs/disk-io.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1086,7 +1086,7 @@ void readahead_tree_block(struct btrfs_root *root, u64 bytenr) 
	free_extent_buffer(buf);

	free_extent_buffer(buf);

}

}





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

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,

			 int mirror_num, struct extent_buffer **eb)

			 int mirror_num, struct extent_buffer **eb)

{

{

	struct extent_buffer *buf = NULL;

	struct extent_buffer *buf = NULL;
@@ -1094,7 +1094,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, 
	struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;

	struct extent_io_tree *io_tree = &BTRFS_I(btree_inode)->io_tree;

	int ret;

	int ret;





	buf = btrfs_find_create_tree_block(root, bytenr, blocksize);

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

	if (!buf)

	if (!buf)

		return 0;

		return 0;

fs/btrfs/disk-io.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ struct btrfs_fs_devices; 
struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,

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

				      u64 parent_transid);

				      u64 parent_transid);

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

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

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

int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr,

			 int mirror_num, struct extent_buffer **eb);

			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						   u64 bytenr, u32 blocksize);

						   u64 bytenr, u32 blocksize);

fs/btrfs/reada.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -721,7 +721,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info, 




	atomic_inc(&dev->reada_in_flight);

	atomic_inc(&dev->reada_in_flight);

	ret = reada_tree_block_flagged(fs_info->extent_root, logical,

	ret = reada_tree_block_flagged(fs_info->extent_root, logical,

			fs_info->tree_root->nodesize, mirror_num, &eb);

			mirror_num, &eb);

	if (ret)

	if (ret)

		__readahead_hook(fs_info->extent_root, NULL, logical, ret);

		__readahead_hook(fs_info->extent_root, NULL, logical, ret);

	else if (eb)

	else if (eb)