[f2fs-dev] [PATCH 018/153] f2fs: Use a folio in f2fs_ra_meta_pages()

[Matthew Wilcox (Oracle)]

Remove three hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/checkpoint.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 75aad6ccd9d0..1a5fbecd9356 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -252,7 +252,6 @@ bool f2fs_is_valid_blkaddr_raw(struct f2fs_sb_info *sbi,
 int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
                                                        int type, bool sync)
 {
-       struct page *page;
        block_t blkno = start;
        struct f2fs_io_info fio = {
                .sbi = sbi,
@@ -271,6 +270,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t 
start, int nrpages,
 
        blk_start_plug(&plug);
        for (; nrpages-- > 0; blkno++) {
+               struct folio *folio;
 
                if (!f2fs_is_valid_blkaddr(sbi, blkno, type))
                        goto out;
@@ -300,18 +300,18 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t 
start, int nrpages,
                        BUG();
                }
 
-               page = f2fs_grab_cache_page(META_MAPPING(sbi),
+               folio = f2fs_grab_cache_folio(META_MAPPING(sbi),
                                                fio.new_blkaddr, false);
-               if (!page)
+               if (IS_ERR(folio))
                        continue;
-               if (PageUptodate(page)) {
-                       f2fs_put_page(page, 1);
+               if (folio_test_uptodate(folio)) {
+                       f2fs_folio_put(folio, true);
                        continue;
                }
 
-               fio.page = page;
+               fio.page = &folio->page;
                err = f2fs_submit_page_bio(&fio);
-               f2fs_put_page(page, err ? 1 : 0);
+               f2fs_folio_put(folio, err ? true : false);
 
                if (!err)
                        f2fs_update_iostat(sbi, NULL, FS_META_READ_IO,
-- 
2.47.2



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel