Skip to content

Commit fec9035

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Use a bio in f2fs_submit_page_write()
Convert bio_page to bio_folio and use it throughout. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 5e2a00e commit fec9035

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

fs/f2fs/data.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
949949
struct f2fs_sb_info *sbi = fio->sbi;
950950
enum page_type btype = PAGE_TYPE_OF_BIO(fio->type);
951951
struct f2fs_bio_info *io = sbi->write_io[btype] + fio->temp;
952-
struct page *bio_page;
952+
struct folio *bio_folio;
953953
enum count_type type;
954954

955955
f2fs_bug_on(sbi, is_read_io(fio->op));
@@ -980,33 +980,33 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
980980
verify_fio_blkaddr(fio);
981981

982982
if (fio->encrypted_page)
983-
bio_page = fio->encrypted_page;
983+
bio_folio = page_folio(fio->encrypted_page);
984984
else if (fio->compressed_page)
985-
bio_page = fio->compressed_page;
985+
bio_folio = page_folio(fio->compressed_page);
986986
else
987-
bio_page = fio->page;
987+
bio_folio = fio->folio;
988988

989989
/* set submitted = true as a return value */
990990
fio->submitted = 1;
991991

992-
type = WB_DATA_TYPE(bio_page, fio->compressed_page);
992+
type = WB_DATA_TYPE(&bio_folio->page, fio->compressed_page);
993993
inc_page_count(sbi, type);
994994

995995
if (io->bio &&
996996
(!io_is_mergeable(sbi, io->bio, io, fio, io->last_block_in_bio,
997997
fio->new_blkaddr) ||
998998
!f2fs_crypt_mergeable_bio(io->bio, fio_inode(fio),
999-
page_folio(bio_page)->index, fio)))
999+
bio_folio->index, fio)))
10001000
__submit_merged_bio(io);
10011001
alloc_new:
10021002
if (io->bio == NULL) {
10031003
io->bio = __bio_alloc(fio, BIO_MAX_VECS);
10041004
f2fs_set_bio_crypt_ctx(io->bio, fio_inode(fio),
1005-
page_folio(bio_page)->index, fio, GFP_NOIO);
1005+
bio_folio->index, fio, GFP_NOIO);
10061006
io->fio = *fio;
10071007
}
10081008

1009-
if (bio_add_page(io->bio, bio_page, PAGE_SIZE, 0) < PAGE_SIZE) {
1009+
if (!bio_add_folio(io->bio, bio_folio, folio_size(bio_folio), 0)) {
10101010
__submit_merged_bio(io);
10111011
goto alloc_new;
10121012
}

0 commit comments

Comments
 (0)