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

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

btrfs: remove redundant parameter from btree_readahead_hook 



We can read fs_info from eb.

Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7ef70b4d

fs/btrfs/ctree.h

+1 −2
Original line number Diff line number Diff line
@@ -3672,8 +3672,7 @@ struct reada_control *btrfs_reada_add(struct btrfs_root *root, 
			      struct btrfs_key *start, struct btrfs_key *end);

int btrfs_reada_wait(void *handle);

void btrfs_reada_detach(void *handle);

int btree_readahead_hook(struct btrfs_fs_info *fs_info,

			 struct extent_buffer *eb, int err);

int btree_readahead_hook(struct extent_buffer *eb, int err);



static inline int is_fstree(u64 rootid)

{

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static int btree_readpage_end_io_hook(struct btrfs_io_bio *io_bio, 
err:

	if (reads_done &&

	    test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags))

		btree_readahead_hook(fs_info, eb, ret);

		btree_readahead_hook(eb, ret);



	if (ret) {

		/*
@@ -787,7 +787,7 @@ static int btree_io_failed_hook(struct page *page, int failed_mirror) 
	eb->read_mirror = failed_mirror;

	atomic_dec(&eb->io_pages);

	if (test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags))

		btree_readahead_hook(eb->fs_info, eb, -EIO);

		btree_readahead_hook(eb, -EIO);

	return -EIO;	/* we fixed nothing */

}

fs/btrfs/reada.c

+2 −2
Original line number Diff line number Diff line
@@ -209,9 +209,9 @@ static void __readahead_hook(struct btrfs_fs_info *fs_info, 
	return;

}



int btree_readahead_hook(struct btrfs_fs_info *fs_info,

			 struct extent_buffer *eb, int err)

int btree_readahead_hook(struct extent_buffer *eb, int err)

{

	struct btrfs_fs_info *fs_info = eb->fs_info;

	int ret = 0;

	struct reada_extent *re;