Commit 72cffee4 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: remove mirror_num argument from extent_read_full_page 



It's called only from btrfs_readpage which always passes 0 so just sink
the argument into extent_read_full_page.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1a5ee1e6

fs/btrfs/extent_io.c

+3 −3
Original line number Diff line number Diff line
@@ -3381,15 +3381,15 @@ static int __extent_read_full_page(struct page *page, struct bio **bio, 
	return ret;

}



int extent_read_full_page(struct page *page, int mirror_num)

int extent_read_full_page(struct page *page)

{

	struct bio *bio = NULL;

	unsigned long bio_flags = 0;

	int ret;



	ret = __extent_read_full_page(page, &bio, mirror_num, &bio_flags, 0);

	ret = __extent_read_full_page(page, &bio, 0, &bio_flags, 0);

	if (bio)

		ret = submit_one_bio(bio, mirror_num, bio_flags);

		ret = submit_one_bio(bio, 0, bio_flags);

	return ret;

}

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ typedef struct extent_map *(get_extent_t)(struct btrfs_inode *inode, 
int try_release_extent_mapping(struct page *page, gfp_t mask);

int try_release_extent_buffer(struct page *page);



int extent_read_full_page(struct page *page, int mirror_num);

int extent_read_full_page(struct page *page);

int extent_write_full_page(struct page *page, struct writeback_control *wbc);

int extent_write_locked_range(struct inode *inode, u64 start, u64 end,

			      int mode);

fs/btrfs/inode.c

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


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

{

	return extent_read_full_page(page, 0);

	return extent_read_full_page(page);

}



static int btrfs_writepage(struct page *page, struct writeback_control *wbc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE