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

btrfs: sink get_extent parameter to __extent_readpages 



All callers pass btrfs_get_extent.

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

fs/btrfs/extent_io.c

+8 −7
Original line number Original line Diff line number Diff line
@@ -3121,7 +3121,7 @@ static inline void __do_contiguous_readpages(struct extent_io_tree *tree, 




static void __extent_readpages(struct extent_io_tree *tree,

static void __extent_readpages(struct extent_io_tree *tree,

			       struct page *pages[],

			       struct page *pages[],

			       int nr_pages, get_extent_t *get_extent,

			       int nr_pages,

			       struct extent_map **em_cached,

			       struct extent_map **em_cached,

			       struct bio **bio, unsigned long *bio_flags,

			       struct bio **bio, unsigned long *bio_flags,

			       u64 *prev_em_start)

			       u64 *prev_em_start)
@@ -3143,7 +3143,8 @@ static void __extent_readpages(struct extent_io_tree *tree, 
		} else {

		} else {

			__do_contiguous_readpages(tree, &pages[first_index],

			__do_contiguous_readpages(tree, &pages[first_index],

						  index - first_index, start,

						  index - first_index, start,

						  end, get_extent, em_cached,

						  end, btrfs_get_extent,

						  em_cached,

						  bio, bio_flags,

						  bio, bio_flags,

						  prev_em_start);

						  prev_em_start);

			start = page_start;

			start = page_start;
@@ -3155,7 +3156,7 @@ static void __extent_readpages(struct extent_io_tree *tree, 
	if (end)

	if (end)

		__do_contiguous_readpages(tree, &pages[first_index],

		__do_contiguous_readpages(tree, &pages[first_index],

					  index - first_index, start,

					  index - first_index, start,

					  end, get_extent, em_cached, bio,

					  end, btrfs_get_extent, em_cached, bio,

					  bio_flags, prev_em_start);

					  bio_flags, prev_em_start);

}

}
@@ -4159,13 +4160,13 @@ int extent_readpages(struct extent_io_tree *tree, 
		pagepool[nr++] = page;

		pagepool[nr++] = page;

		if (nr < ARRAY_SIZE(pagepool))

		if (nr < ARRAY_SIZE(pagepool))

			continue;

			continue;

		__extent_readpages(tree, pagepool, nr, btrfs_get_extent,

		__extent_readpages(tree, pagepool, nr, &em_cached, &bio,

				&em_cached, &bio, &bio_flags, &prev_em_start);

				&bio_flags, &prev_em_start);

		nr = 0;

		nr = 0;

	}

	}

	if (nr)

	if (nr)

		__extent_readpages(tree, pagepool, nr, btrfs_get_extent,

		__extent_readpages(tree, pagepool, nr, &em_cached, &bio,

				&em_cached, &bio, &bio_flags, &prev_em_start);

				&bio_flags, &prev_em_start);





	if (em_cached)

	if (em_cached)

		free_extent_map(em_cached);

		free_extent_map(em_cached);