filemap: convert filemap_range_has_page() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 16 Jan 2023 19:39:40 +0000 (19:39 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 3 Feb 2023 06:33:21 +0000 (22:33 -0800)
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: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/filemap.c

index b6b7efc9abc0c9fc6045757d5c3257e4f3ebe39c..c915ded191f03f39671a4fc58f470a5cab1ff5f7 100644 (file)
@@ -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);