Commit 1613fac9 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

mm: Remove pagevec_remove_exceptionals() 



All of its callers now call folio_batch_remove_exceptionals().

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
parent 51dcbdac

include/linux/pagevec.h

+1 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct pagevec { 


void __pagevec_release(struct pagevec *pvec);

void __pagevec_lru_add(struct pagevec *pvec);

void pagevec_remove_exceptionals(struct pagevec *pvec);

unsigned pagevec_lookup_range(struct pagevec *pvec,

			      struct address_space *mapping,

			      pgoff_t *start, pgoff_t end);
@@ -146,8 +145,5 @@ static inline void folio_batch_release(struct folio_batch *fbatch) 
	pagevec_release((struct pagevec *)fbatch);

}



static inline void folio_batch_remove_exceptionals(struct folio_batch *fbatch)

{

	pagevec_remove_exceptionals((struct pagevec *)fbatch);

}

void folio_batch_remove_exceptionals(struct folio_batch *fbatch);

#endif /* _LINUX_PAGEVEC_H */

mm/swap.c

+13 −13
Original line number Diff line number Diff line
@@ -1077,24 +1077,24 @@ void __pagevec_lru_add(struct pagevec *pvec) 
}



/**

 * pagevec_remove_exceptionals - pagevec exceptionals pruning

 * @pvec:	The pagevec to prune

 * folio_batch_remove_exceptionals() - Prune non-folios from a batch.

 * @fbatch: The batch to prune

 *

 * find_get_entries() fills both pages and XArray value entries (aka

 * exceptional entries) into the pagevec.  This function prunes all

 * exceptionals from @pvec without leaving holes, so that it can be

 * passed on to page-only pagevec operations.

 * find_get_entries() fills a batch with both folios and shadow/swap/DAX

 * entries.  This function prunes all the non-folio entries from @fbatch

 * without leaving holes, so that it can be passed on to folio-only batch

 * operations.

 */

void pagevec_remove_exceptionals(struct pagevec *pvec)

void folio_batch_remove_exceptionals(struct folio_batch *fbatch)

{

	int i, j;

	unsigned int i, j;



	for (i = 0, j = 0; i < pagevec_count(pvec); i++) {

		struct page *page = pvec->pages[i];

		if (!xa_is_value(page))

			pvec->pages[j++] = page;

	for (i = 0, j = 0; i < folio_batch_count(fbatch); i++) {

		struct folio *folio = fbatch->folios[i];

		if (!xa_is_value(folio))

			fbatch->folios[j++] = folio;

	}

	pvec->nr = j;

	fbatch->nr = j;

}



/**

mm/truncate.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void clear_shadow_entry(struct address_space *mapping, pgoff_t index, 
/*

 * Unconditionally remove exceptional entries. Usually called from truncate

 * path. Note that the folio_batch may be altered by this function by removing

 * exceptional entries similar to what pagevec_remove_exceptionals does.

 * exceptional entries similar to what folio_batch_remove_exceptionals() does.

 */

static void truncate_folio_batch_exceptionals(struct address_space *mapping,

				struct folio_batch *fbatch, pgoff_t *indices)