]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
f2fs: Use a folio in flush_inline_data()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 31 Mar 2025 20:12:52 +0000 (21:12 +0100)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 28 Apr 2025 15:26:47 +0000 (15:26 +0000)
Get a folio from the page cache and use it throughout.  Removes
six calls to compound_head().

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

index 9375158ae90432b550cc926b3e8829cc1603d38a..c5f736f29413ab959d712eb30e82c7dddd0140d0 100644 (file)
@@ -1561,7 +1561,7 @@ static struct folio *f2fs_get_node_folio_ra(struct folio *parent, int start)
 static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
 {
        struct inode *inode;
-       struct page *page;
+       struct folio *folio;
        int ret;
 
        /* should flush inline_data before evict_inode */
@@ -1569,27 +1569,27 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
        if (!inode)
                return;
 
-       page = f2fs_pagecache_get_page(inode->i_mapping, 0,
+       folio = f2fs_filemap_get_folio(inode->i_mapping, 0,
                                        FGP_LOCK|FGP_NOWAIT, 0);
-       if (!page)
+       if (IS_ERR(folio))
                goto iput_out;
 
-       if (!PageUptodate(page))
-               goto page_out;
+       if (!folio_test_uptodate(folio))
+               goto folio_out;
 
-       if (!PageDirty(page))
-               goto page_out;
+       if (!folio_test_dirty(folio))
+               goto folio_out;
 
-       if (!clear_page_dirty_for_io(page))
-               goto page_out;
+       if (!folio_clear_dirty_for_io(folio))
+               goto folio_out;
 
-       ret = f2fs_write_inline_data(inode, page_folio(page));
+       ret = f2fs_write_inline_data(inode, folio);
        inode_dec_dirty_pages(inode);
        f2fs_remove_dirty_inode(inode);
        if (ret)
-               set_page_dirty(page);
-page_out:
-       f2fs_put_page(page, 1);
+               folio_mark_dirty(folio);
+folio_out:
+       f2fs_folio_put(folio, true);
 iput_out:
        iput(inode);
 }