@@ -1543,8 +1543,8 @@ static int alloc_new_bio(struct btrfs_inode *inode,
1543
1543
/*
1544
1544
* @opf: bio REQ_OP_* and REQ_* flags as one value
1545
1545
* @wbc: optional writeback control for io accounting
1546
- * @page: page to add to the bio
1547
1546
* @disk_bytenr: logical bytenr where the write will be
1547
+ * @page: page to add to the bio
1548
1548
* @size: portion of page that we want to write to
1549
1549
* @pg_offset: offset of the new bio or to check whether we are adding
1550
1550
* a contiguous page to the previous one
@@ -1559,7 +1559,7 @@ static int alloc_new_bio(struct btrfs_inode *inode,
1559
1559
static int submit_extent_page (blk_opf_t opf ,
1560
1560
struct writeback_control * wbc ,
1561
1561
struct btrfs_bio_ctrl * bio_ctrl ,
1562
- struct page * page , u64 disk_bytenr ,
1562
+ u64 disk_bytenr , struct page * page ,
1563
1563
size_t size , unsigned long pg_offset ,
1564
1564
btrfs_bio_end_io_t end_io_func ,
1565
1565
enum btrfs_compression_type compress_type ,
@@ -1875,7 +1875,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
1875
1875
}
1876
1876
1877
1877
ret = submit_extent_page (REQ_OP_READ | read_flags , NULL ,
1878
- bio_ctrl , page , disk_bytenr , iosize ,
1878
+ bio_ctrl , disk_bytenr , page , iosize ,
1879
1879
pg_offset , end_bio_extent_readpage ,
1880
1880
this_bio_flag , force_bio_submit );
1881
1881
if (ret ) {
@@ -2189,8 +2189,8 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
2189
2189
btrfs_page_clear_dirty (fs_info , page , cur , iosize );
2190
2190
2191
2191
ret = submit_extent_page (op | write_flags , wbc ,
2192
- & epd -> bio_ctrl , page ,
2193
- disk_bytenr , iosize ,
2192
+ & epd -> bio_ctrl , disk_bytenr ,
2193
+ page , iosize ,
2194
2194
cur - page_offset (page ),
2195
2195
end_bio_extent_writepage ,
2196
2196
0 , false);
@@ -2686,7 +2686,7 @@ static int write_one_subpage_eb(struct extent_buffer *eb,
2686
2686
clear_page_dirty_for_io (page );
2687
2687
2688
2688
ret = submit_extent_page (REQ_OP_WRITE | write_flags , wbc ,
2689
- & epd -> bio_ctrl , page , eb -> start , eb -> len ,
2689
+ & epd -> bio_ctrl , eb -> start , page , eb -> len ,
2690
2690
eb -> start - page_offset (page ),
2691
2691
end_bio_subpage_eb_writepage , 0 , false);
2692
2692
if (ret ) {
@@ -2726,7 +2726,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
2726
2726
clear_page_dirty_for_io (p );
2727
2727
set_page_writeback (p );
2728
2728
ret = submit_extent_page (REQ_OP_WRITE | write_flags , wbc ,
2729
- & epd -> bio_ctrl , p , disk_bytenr ,
2729
+ & epd -> bio_ctrl , disk_bytenr , p ,
2730
2730
PAGE_SIZE , 0 ,
2731
2731
end_bio_extent_buffer_writepage ,
2732
2732
0 , false);
@@ -4982,7 +4982,7 @@ static int read_extent_buffer_subpage(struct extent_buffer *eb, int wait,
4982
4982
4983
4983
btrfs_subpage_start_reader (fs_info , page , eb -> start , eb -> len );
4984
4984
ret = submit_extent_page (REQ_OP_READ , NULL , & bio_ctrl ,
4985
- page , eb -> start , eb -> len ,
4985
+ eb -> start , page , eb -> len ,
4986
4986
eb -> start - page_offset (page ),
4987
4987
end_bio_extent_readpage , 0 , true);
4988
4988
if (ret ) {
@@ -5087,7 +5087,7 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num)
5087
5087
5088
5088
ClearPageError (page );
5089
5089
err = submit_extent_page (REQ_OP_READ , NULL ,
5090
- & bio_ctrl , page , page_offset (page ),
5090
+ & bio_ctrl , page_offset (page ), page ,
5091
5091
PAGE_SIZE , 0 , end_bio_extent_readpage ,
5092
5092
0 , false);
5093
5093
if (err ) {
0 commit comments