Commit 7525486a authored by Vishal Moola (Oracle)'s avatar Vishal Moola (Oracle) Committed by Andrew Morton
Browse files

f2fs: convert f2fs_sync_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-14-vishal.moola@gmail.com


Signed-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 a40a4ad1

fs/f2fs/node.c

+9 −8
Original line number Diff line number Diff line
@@ -1938,23 +1938,24 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, 
				bool do_balance, enum iostat_type io_type)

{

	pgoff_t index;

	struct pagevec pvec;

	struct folio_batch fbatch;

	int step = 0;

	int nwritten = 0;

	int ret = 0;

	int nr_pages, done = 0;

	int nr_folios, done = 0;



	pagevec_init(&pvec);

	folio_batch_init(&fbatch);



next_step:

	index = 0;



	while (!done && (nr_pages = pagevec_lookup_tag(&pvec,

			NODE_MAPPING(sbi), &index, PAGECACHE_TAG_DIRTY))) {

	while (!done && (nr_folios = filemap_get_folios_tag(NODE_MAPPING(sbi),

				&index, (pgoff_t)-1, PAGECACHE_TAG_DIRTY,

				&fbatch))) {

		int i;



		for (i = 0; i < nr_pages; i++) {

			struct page *page = pvec.pages[i];

		for (i = 0; i < nr_folios; i++) {

			struct page *page = &fbatch.folios[i]->page;

			bool submitted = false;



			/* give a priority to WB_SYNC threads */
@@ -2029,7 +2030,7 @@ int f2fs_sync_node_pages(struct f2fs_sb_info *sbi, 
			if (--wbc->nr_to_write == 0)

				break;

		}

		pagevec_release(&pvec);

		folio_batch_release(&fbatch);

		cond_resched();



		if (wbc->nr_to_write == 0) {