Commit 2135fb9b authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink get_extent parameter to extent_fiemap 



All callers pass btrfs_get_extent_fiemap and we don't expect anything
else in the context of extent_fiemap.

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

fs/btrfs/extent_io.c

+3 −3
Original line number Diff line number Diff line
@@ -4441,7 +4441,7 @@ static int emit_last_fiemap_cache(struct btrfs_fs_info *fs_info, 
}



int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		__u64 start, __u64 len, get_extent_t *get_extent)

		__u64 start, __u64 len)

{

	int ret = 0;

	u64 off = start;
@@ -4524,7 +4524,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
			 &cached_state);



	em = get_extent_skip_holes(inode, start, last_for_get_extent,

				   get_extent);

				   btrfs_get_extent_fiemap);

	if (!em)

		goto out;

	if (IS_ERR(em)) {
@@ -4613,7 +4613,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 


		/* now scan forward to see if this is really the last extent. */

		em = get_extent_skip_holes(inode, off, last_for_get_extent,

					   get_extent);

					   btrfs_get_extent_fiemap);

		if (IS_ERR(em)) {

			ret = PTR_ERR(em);

			goto out;

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ int extent_readpages(struct extent_io_tree *tree, 
		     struct list_head *pages, unsigned nr_pages,

		     get_extent_t get_extent);

int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

		__u64 start, __u64 len, get_extent_t *get_extent);

		__u64 start, __u64 len);

void set_page_extent_mapped(struct page *page);



struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -8859,7 +8859,7 @@ static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
	if (ret)

		return ret;



	return extent_fiemap(inode, fieinfo, start, len, btrfs_get_extent_fiemap);

	return extent_fiemap(inode, fieinfo, start, len);

}



int btrfs_readpage(struct file *file, struct page *page)