Skip to content

Commit a4d0770

Browse files
Matthew Wilcox (Oracle)Jaegeuk Kim
authored andcommitted
f2fs: Use a folio in flush_inline_data()
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>
1 parent 6b1ad39 commit a4d0770

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

fs/f2fs/node.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,35 +1561,35 @@ static struct folio *f2fs_get_node_folio_ra(struct folio *parent, int start)
15611561
static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
15621562
{
15631563
struct inode *inode;
1564-
struct page *page;
1564+
struct folio *folio;
15651565
int ret;
15661566

15671567
/* should flush inline_data before evict_inode */
15681568
inode = ilookup(sbi->sb, ino);
15691569
if (!inode)
15701570
return;
15711571

1572-
page = f2fs_pagecache_get_page(inode->i_mapping, 0,
1572+
folio = f2fs_filemap_get_folio(inode->i_mapping, 0,
15731573
FGP_LOCK|FGP_NOWAIT, 0);
1574-
if (!page)
1574+
if (IS_ERR(folio))
15751575
goto iput_out;
15761576

1577-
if (!PageUptodate(page))
1578-
goto page_out;
1577+
if (!folio_test_uptodate(folio))
1578+
goto folio_out;
15791579

1580-
if (!PageDirty(page))
1581-
goto page_out;
1580+
if (!folio_test_dirty(folio))
1581+
goto folio_out;
15821582

1583-
if (!clear_page_dirty_for_io(page))
1584-
goto page_out;
1583+
if (!folio_clear_dirty_for_io(folio))
1584+
goto folio_out;
15851585

1586-
ret = f2fs_write_inline_data(inode, page_folio(page));
1586+
ret = f2fs_write_inline_data(inode, folio);
15871587
inode_dec_dirty_pages(inode);
15881588
f2fs_remove_dirty_inode(inode);
15891589
if (ret)
1590-
set_page_dirty(page);
1591-
page_out:
1592-
f2fs_put_page(page, 1);
1590+
folio_mark_dirty(folio);
1591+
folio_out:
1592+
f2fs_folio_put(folio, true);
15931593
iput_out:
15941594
iput(inode);
15951595
}

0 commit comments

Comments
 (0)