Skip to content

Commit 209ecde

Browse files
adam900710kdave
authored andcommitted
btrfs: switch page and disk_bytenr argument position for submit_extent_page()
Normally we put (page, pg_len, pg_offset) arguments together, just like what __bio_add_page() does. But in submit_extent_page(), what we got is, (page, disk_bytenr, pg_len, pg_offset), which sometimes can be confusing. Change the order to (disk_bytenr, page, pg_len, pg_offset) to make it to follow the common schema. Reviewed-by: Anand Jain <[email protected]> Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 814b6f9 commit 209ecde

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

fs/btrfs/extent_io.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -1543,8 +1543,8 @@ static int alloc_new_bio(struct btrfs_inode *inode,
15431543
/*
15441544
* @opf: bio REQ_OP_* and REQ_* flags as one value
15451545
* @wbc: optional writeback control for io accounting
1546-
* @page: page to add to the bio
15471546
* @disk_bytenr: logical bytenr where the write will be
1547+
* @page: page to add to the bio
15481548
* @size: portion of page that we want to write to
15491549
* @pg_offset: offset of the new bio or to check whether we are adding
15501550
* a contiguous page to the previous one
@@ -1559,7 +1559,7 @@ static int alloc_new_bio(struct btrfs_inode *inode,
15591559
static int submit_extent_page(blk_opf_t opf,
15601560
struct writeback_control *wbc,
15611561
struct btrfs_bio_ctrl *bio_ctrl,
1562-
struct page *page, u64 disk_bytenr,
1562+
u64 disk_bytenr, struct page *page,
15631563
size_t size, unsigned long pg_offset,
15641564
btrfs_bio_end_io_t end_io_func,
15651565
enum btrfs_compression_type compress_type,
@@ -1875,7 +1875,7 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
18751875
}
18761876

18771877
ret = submit_extent_page(REQ_OP_READ | read_flags, NULL,
1878-
bio_ctrl, page, disk_bytenr, iosize,
1878+
bio_ctrl, disk_bytenr, page, iosize,
18791879
pg_offset, end_bio_extent_readpage,
18801880
this_bio_flag, force_bio_submit);
18811881
if (ret) {
@@ -2189,8 +2189,8 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,
21892189
btrfs_page_clear_dirty(fs_info, page, cur, iosize);
21902190

21912191
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,
21942194
cur - page_offset(page),
21952195
end_bio_extent_writepage,
21962196
0, false);
@@ -2686,7 +2686,7 @@ static int write_one_subpage_eb(struct extent_buffer *eb,
26862686
clear_page_dirty_for_io(page);
26872687

26882688
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,
26902690
eb->start - page_offset(page),
26912691
end_bio_subpage_eb_writepage, 0, false);
26922692
if (ret) {
@@ -2726,7 +2726,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
27262726
clear_page_dirty_for_io(p);
27272727
set_page_writeback(p);
27282728
ret = submit_extent_page(REQ_OP_WRITE | write_flags, wbc,
2729-
&epd->bio_ctrl, p, disk_bytenr,
2729+
&epd->bio_ctrl, disk_bytenr, p,
27302730
PAGE_SIZE, 0,
27312731
end_bio_extent_buffer_writepage,
27322732
0, false);
@@ -4982,7 +4982,7 @@ static int read_extent_buffer_subpage(struct extent_buffer *eb, int wait,
49824982

49834983
btrfs_subpage_start_reader(fs_info, page, eb->start, eb->len);
49844984
ret = submit_extent_page(REQ_OP_READ, NULL, &bio_ctrl,
4985-
page, eb->start, eb->len,
4985+
eb->start, page, eb->len,
49864986
eb->start - page_offset(page),
49874987
end_bio_extent_readpage, 0, true);
49884988
if (ret) {
@@ -5087,7 +5087,7 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num)
50875087

50885088
ClearPageError(page);
50895089
err = submit_extent_page(REQ_OP_READ, NULL,
5090-
&bio_ctrl, page, page_offset(page),
5090+
&bio_ctrl, page_offset(page), page,
50915091
PAGE_SIZE, 0, end_bio_extent_readpage,
50925092
0, false);
50935093
if (err) {

0 commit comments

Comments
 (0)