f2fs: Use a folio in add_ipu_page()

Convert the incoming page to a folio at the start, then use the
folio later in the function.  Moves a call to page_folio() earlier,
and removes an access to page->mapping.

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 5cf4b0517e6c66eddf946b97d1af8a4f08972777..5759a8d6b926f7de37600203e0aad9dbbe380094 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -779,6 +779,7 @@ static void del_bio_entry(struct bio_entry *be)
 static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,
                                                        struct page *page)
 {
+       struct folio *fio_folio = page_folio(fio->page);
        struct f2fs_sb_info *sbi = fio->sbi;
        enum temp_type temp;
        bool found = false;
@@ -800,8 +801,8 @@ static int add_ipu_page(struct f2fs_io_info *fio, struct bio **bio,
                                                            *fio->last_block,
                                                            fio->new_blkaddr));
                        if (f2fs_crypt_mergeable_bio(*bio,
-                                       fio->page->mapping->host,
-                                       page_folio(fio->page)->index, fio) &&
+                                       fio_folio->mapping->host,
+                                       fio_folio->index, fio) &&
                            bio_add_page(*bio, page, PAGE_SIZE, 0) ==
                                        PAGE_SIZE) {
                                ret = 0;