From: Matthew Wilcox (Oracle) Date: Mon, 31 Mar 2025 20:11:13 +0000 (+0100) Subject: f2fs: Use a folio in f2fs_defragment_range() X-Git-Tag: v6.16-rc1~115^2~130 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0a4bb8ae6da4047f8e72bc329130125d2f63d75;p=thirdparty%2Fkernel%2Flinux.git f2fs: Use a folio in f2fs_defragment_range() Remove three hidden calls to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6d77497ef914e..471cdd3ba16db 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2923,19 +2923,19 @@ do_map: idx = map.m_lblk; while (idx < map.m_lblk + map.m_len && cnt < BLKS_PER_SEG(sbi)) { - struct page *page; + struct folio *folio; - page = f2fs_get_lock_data_page(inode, idx, true); - if (IS_ERR(page)) { - err = PTR_ERR(page); + folio = f2fs_get_lock_data_folio(inode, idx, true); + if (IS_ERR(folio)) { + err = PTR_ERR(folio); goto clear_out; } - f2fs_wait_on_page_writeback(page, DATA, true, true); + f2fs_folio_wait_writeback(folio, DATA, true, true); - set_page_dirty(page); - set_page_private_gcing(page); - f2fs_put_page(page, 1); + folio_mark_dirty(folio); + set_page_private_gcing(&folio->page); + f2fs_folio_put(folio, true); idx++; cnt++;