Commit eff3b364 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

filemap: convert filemap_range_has_page() to use a folio 

The folio isn't returned from this function, so this is an entirely
internal change.

Link: https://lkml.kernel.org/r/20230116193941.2148487-3-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8808ecab

mm/filemap.c

+5 −5
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ EXPORT_SYMBOL(filemap_flush); 
bool filemap_range_has_page(struct address_space *mapping,

			   loff_t start_byte, loff_t end_byte)

{

	struct page *page;

	struct folio *folio;

	XA_STATE(xas, &mapping->i_pages, start_byte >> PAGE_SHIFT);

	pgoff_t max = end_byte >> PAGE_SHIFT;
@@ -479,11 +479,11 @@ bool filemap_range_has_page(struct address_space *mapping, 


	rcu_read_lock();

	for (;;) {

		page = xas_find(&xas, max);

		if (xas_retry(&xas, page))

		folio = xas_find(&xas, max);

		if (xas_retry(&xas, folio))

			continue;

		/* Shadow entries don't count */

		if (xa_is_value(page))

		if (xa_is_value(folio))

			continue;

		/*

		 * We don't need to try to pin this page; we're about to
@@ -494,7 +494,7 @@ bool filemap_range_has_page(struct address_space *mapping, 
	}

	rcu_read_unlock();



	return page != NULL;

	return folio != NULL;

}

EXPORT_SYMBOL(filemap_range_has_page);