diff mbox series

[v2,7/9] btrfs: Sink mirror_num argument in extent_read_full_page

Message ID 20200914093711.13523-8-nborisov@suse.com (mailing list archive)
State New, archived
Headers show
Series Cleanup metadata page reading path | expand

Commit Message

Nikolay Borisov Sept. 14, 2020, 9:37 a.m. UTC 
It's always set to 0 from the sole caller - btrfs_readpage.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/extent_io.c | 5 ++---
 fs/btrfs/extent_io.h | 2 +-
 fs/btrfs/inode.c     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

--
2.17.1

Comments

Johannes Thumshirn Sept. 14, 2020, 10:35 a.m. UTC | #1 
On 14/09/2020 11:37, Nikolay Borisov wrote:
> @@ -3375,8 +3375,7 @@ int extent_read_full_page(struct page *page, struct bio **bio, int mirror_num,
> 
>  	btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);
> 
> -	ret = __do_readpage(page, NULL, bio, mirror_num, bio_flags, read_flags,
> -			    NULL);
> +	ret = __do_readpage(page, NULL, bio, 0, bio_flags, read_flags, NULL);
>  	return ret;
>  }

	return _do_readpage(page, NULL, bio, 0, bio_flags, read_flags, NULL);
Nikolay Borisov Sept. 14, 2020, 10:38 a.m. UTC | #2 
On 14.09.20 г. 13:35 ч., Johannes Thumshirn wrote:
> On 14/09/2020 11:37, Nikolay Borisov wrote:
>> @@ -3375,8 +3375,7 @@ int extent_read_full_page(struct page *page, struct bio **bio, int mirror_num,
>>
>>  	btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);
>>
>> -	ret = __do_readpage(page, NULL, bio, mirror_num, bio_flags, read_flags,
>> -			    NULL);
>> +	ret = __do_readpage(page, NULL, bio, 0, bio_flags, read_flags, NULL);
>>  	return ret;
>>  }
> 
> 	return _do_readpage(page, NULL, bio, 0, bio_flags, read_flags, NULL);
> 

Ah yes, but actually I think extent_read_full_page should be opencoded
in btrfs_readpage ..
diff mbox series

Patch

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 402b88ddcbca..f43827bee7e6 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3365,7 +3365,7 @@  static inline void contiguous_readpages(struct page *pages[], int nr_pages,
 	}
 }

-int extent_read_full_page(struct page *page, struct bio **bio, int mirror_num,
+int extent_read_full_page(struct page *page, struct bio **bio,
 			  unsigned long *bio_flags, unsigned int read_flags)
 {
 	struct btrfs_inode *inode = BTRFS_I(page->mapping->host);
@@ -3375,8 +3375,7 @@  int extent_read_full_page(struct page *page, struct bio **bio, int mirror_num,

 	btrfs_lock_and_flush_ordered_range(inode, start, end, NULL);

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

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 8fec00c50846..3562c9203de3 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -195,7 +195,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, int mirror_num,
+int extent_read_full_page(struct page *page, struct bio **bio,
 			  unsigned long *bio_flags, unsigned int read_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,
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f01066607901..31a154c7fb00 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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, 0, &bio_flags, 0);
+	ret = extent_read_full_page(page, &bio, &bio_flags, 0);
 	if (bio)
 		ret = submit_one_bio(bio, 0, bio_flags);
 	return ret;