f2fs: Use a data folio in f2fs_submit_page_bio()

Remove a call to compound_head().  We can call bio_add_folio_nofail()
here because we just allocated the bio, so we know it can't fail and
thus the error path can never be taken.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index cae5fa895b971abe0b7642f9306ca9465e4a150a..30d727808c928b35d6bece50c00afb45c8e86198 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -685,32 +685,28 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
 {
        struct bio *bio;
        struct folio *fio_folio = page_folio(fio->page);
-       struct page *page = fio->encrypted_page ?
-                       fio->encrypted_page : fio->page;
+       struct folio *data_folio = fio->encrypted_page ?
+                       page_folio(fio->encrypted_page) : fio_folio;
 
        if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,
                        fio->is_por ? META_POR : (__is_meta_io(fio) ?
                        META_GENERIC : DATA_GENERIC_ENHANCE)))
                return -EFSCORRUPTED;
 
-       trace_f2fs_submit_folio_bio(page_folio(page), fio);
+       trace_f2fs_submit_folio_bio(data_folio, fio);
 
        /* Allocate a new bio */
        bio = __bio_alloc(fio, 1);
 
        f2fs_set_bio_crypt_ctx(bio, fio_folio->mapping->host,
                        fio_folio->index, fio, GFP_NOIO);
-
-       if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
-               bio_put(bio);
-               return -EFAULT;
-       }
+       bio_add_folio_nofail(bio, data_folio, folio_size(data_folio), 0);
 
        if (fio->io_wbc && !is_read_io(fio->op))
                wbc_account_cgroup_owner(fio->io_wbc, fio_folio, PAGE_SIZE);
 
        inc_page_count(fio->sbi, is_read_io(fio->op) ?
-                       __read_io_type(page) : WB_DATA_TYPE(fio->page, false));
+                       __read_io_type(&data_folio->page) : WB_DATA_TYPE(fio->page, false));
 
        if (is_read_io(bio_op(bio)))
                f2fs_submit_read_bio(fio->sbi, bio, fio->type);