@@ -1086,22 +1086,22 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
1086
1086
}
1087
1087
1088
1088
/* This can handle encryption stuffs */
1089
- static int f2fs_submit_page_read (struct inode * inode , struct page * page ,
1089
+ static int f2fs_submit_page_read (struct inode * inode , struct folio * folio ,
1090
1090
block_t blkaddr , blk_opf_t op_flags ,
1091
1091
bool for_write )
1092
1092
{
1093
1093
struct f2fs_sb_info * sbi = F2FS_I_SB (inode );
1094
1094
struct bio * bio ;
1095
1095
1096
1096
bio = f2fs_grab_read_bio (inode , blkaddr , 1 , op_flags ,
1097
- page -> index , for_write );
1097
+ folio -> index , for_write );
1098
1098
if (IS_ERR (bio ))
1099
1099
return PTR_ERR (bio );
1100
1100
1101
1101
/* wait for GCed page writeback via META_MAPPING */
1102
1102
f2fs_wait_on_block_writeback (inode , blkaddr );
1103
1103
1104
- if (bio_add_page (bio , page , PAGE_SIZE , 0 ) < PAGE_SIZE ) {
1104
+ if (! bio_add_folio (bio , folio , PAGE_SIZE , 0 )) {
1105
1105
iostat_update_and_unbind_ctx (bio );
1106
1106
if (bio -> bi_private )
1107
1107
mempool_free (bio -> bi_private , bio_post_read_ctx_pool );
@@ -1269,7 +1269,7 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
1269
1269
return page ;
1270
1270
}
1271
1271
1272
- err = f2fs_submit_page_read (inode , page , dn .data_blkaddr ,
1272
+ err = f2fs_submit_page_read (inode , page_folio ( page ) , dn .data_blkaddr ,
1273
1273
op_flags , for_write );
1274
1274
if (err )
1275
1275
goto put_err ;
@@ -3668,8 +3668,8 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
3668
3668
goto fail ;
3669
3669
}
3670
3670
err = f2fs_submit_page_read (use_cow ?
3671
- F2FS_I (inode )-> cow_inode : inode , page ,
3672
- blkaddr , 0 , true);
3671
+ F2FS_I (inode )-> cow_inode : inode ,
3672
+ page_folio ( page ), blkaddr , 0 , true);
3673
3673
if (err )
3674
3674
goto fail ;
3675
3675
0 commit comments