Skip to content

Commit

Permalink
btrfs: sink read_flags argument into extent_read_full_page
Browse files Browse the repository at this point in the history
It's always set to 0 by its sole caller - btrfs_readpage. Simply remove
it.

Reviewed-by: Josef Bacik <[email protected]>
Reviewed-by: Johannes Thumshirn <[email protected]>
Signed-off-by: Nikolay Borisov <[email protected]>
Reviewed-by: David Sterba <[email protected]>
Signed-off-by: David Sterba <[email protected]>
  • Loading branch information
lorddoskias authored and kdave committed Oct 7, 2020
1 parent 003c286 commit 6f15af6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -3366,7 +3366,7 @@ static inline void contiguous_readpages(struct page *pages[], int nr_pages,
}

int extent_read_full_page(struct page *page, struct bio **bio,
unsigned long *bio_flags, unsigned int read_flags)
unsigned long *bio_flags)
{
struct btrfs_inode *inode = BTRFS_I(page->mapping->host);
u64 start = page_offset(page);
Expand All @@ -3375,7 +3375,7 @@ int extent_read_full_page(struct page *page, struct bio **bio,

btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);

ret = __do_readpage(page, NULL, bio, 0, bio_flags, read_flags, NULL);
ret = __do_readpage(page, NULL, bio, 0, bio_flags, 0, NULL);
return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/extent_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ int try_release_extent_buffer(struct page *page);
int __must_check submit_one_bio(struct bio *bio, int mirror_num,
unsigned long bio_flags);
int extent_read_full_page(struct page *page, struct bio **bio,
unsigned long *bio_flags, unsigned int read_flags);
unsigned long *bio_flags);
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);
Expand Down
2 changes: 1 addition & 1 deletion fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -8044,7 +8044,7 @@ int btrfs_readpage(struct file *file, struct page *page)
unsigned long bio_flags = 0;
int ret;

ret = extent_read_full_page(page, &bio, &bio_flags, 0);
ret = extent_read_full_page(page, &bio, &bio_flags);
if (bio)
ret = submit_one_bio(bio, 0, bio_flags);
return ret;
Expand Down

0 comments on commit 6f15af6

Please sign in to comment.