Commit e6e46e1e authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by Andrew Morton

f2fs: convert f2fs_fsync_node_pages() to use filemap_get_folios_tag()

Convert function to use a folio_batch instead of pagevec.  This is in
preparation for the removal of find_get_pages_range_tag().

Link: https://lkml.kernel.org/r/20230104211448.4804-12-vishal.moola@gmail.comSigned-off-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Acked-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 50ead253
...@@ -1731,12 +1731,12 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, ...@@ -1731,12 +1731,12 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
unsigned int *seq_id) unsigned int *seq_id)
{ {
pgoff_t index; pgoff_t index;
struct pagevec pvec; struct folio_batch fbatch;
int ret = 0; int ret = 0;
struct page *last_page = NULL; struct page *last_page = NULL;
bool marked = false; bool marked = false;
nid_t ino = inode->i_ino; nid_t ino = inode->i_ino;
int nr_pages; int nr_folios;
int nwritten = 0; int nwritten = 0;
if (atomic) { if (atomic) {
...@@ -1745,20 +1745,21 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, ...@@ -1745,20 +1745,21 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
return PTR_ERR_OR_ZERO(last_page); return PTR_ERR_OR_ZERO(last_page);
} }
retry: retry:
pagevec_init(&pvec); folio_batch_init(&fbatch);
index = 0; index = 0;
while ((nr_pages = pagevec_lookup_tag(&pvec, NODE_MAPPING(sbi), &index, while ((nr_folios = filemap_get_folios_tag(NODE_MAPPING(sbi), &index,
PAGECACHE_TAG_DIRTY))) { (pgoff_t)-1, PAGECACHE_TAG_DIRTY,
&fbatch))) {
int i; int i;
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_folios; i++) {
struct page *page = pvec.pages[i]; struct page *page = &fbatch.folios[i]->page;
bool submitted = false; bool submitted = false;
if (unlikely(f2fs_cp_error(sbi))) { if (unlikely(f2fs_cp_error(sbi))) {
f2fs_put_page(last_page, 0); f2fs_put_page(last_page, 0);
pagevec_release(&pvec); folio_batch_release(&fbatch);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
...@@ -1824,7 +1825,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, ...@@ -1824,7 +1825,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode,
break; break;
} }
} }
pagevec_release(&pvec); folio_batch_release(&fbatch);
cond_resched(); cond_resched();
if (ret || marked) if (ret || marked)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment