Commit 2c3f6194 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

swapfile: convert __try_to_reclaim_swap() to use a folio

Saves five calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-36-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 000085b9
...@@ -132,27 +132,27 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si, ...@@ -132,27 +132,27 @@ static int __try_to_reclaim_swap(struct swap_info_struct *si,
unsigned long offset, unsigned long flags) unsigned long offset, unsigned long flags)
{ {
swp_entry_t entry = swp_entry(si->type, offset); swp_entry_t entry = swp_entry(si->type, offset);
struct page *page; struct folio *folio;
int ret = 0; int ret = 0;
page = find_get_page(swap_address_space(entry), offset); folio = filemap_get_folio(swap_address_space(entry), offset);
if (!page) if (!folio)
return 0; return 0;
/* /*
* When this function is called from scan_swap_map_slots() and it's * When this function is called from scan_swap_map_slots() and it's
* called by vmscan.c at reclaiming pages. So, we hold a lock on a page, * called by vmscan.c at reclaiming folios. So we hold a folio lock
* here. We have to use trylock for avoiding deadlock. This is a special * here. We have to use trylock for avoiding deadlock. This is a special
* case and you should use try_to_free_swap() with explicit lock_page() * case and you should use folio_free_swap() with explicit folio_lock()
* in usual operations. * in usual operations.
*/ */
if (trylock_page(page)) { if (folio_trylock(folio)) {
if ((flags & TTRS_ANYWAY) || if ((flags & TTRS_ANYWAY) ||
((flags & TTRS_UNMAPPED) && !page_mapped(page)) || ((flags & TTRS_UNMAPPED) && !folio_mapped(folio)) ||
((flags & TTRS_FULL) && mem_cgroup_swap_full(page))) ((flags & TTRS_FULL) && mem_cgroup_swap_full(&folio->page)))
ret = try_to_free_swap(page); ret = folio_free_swap(folio);
unlock_page(page); folio_unlock(folio);
} }
put_page(page); folio_put(folio);
return ret; return ret;
} }
......
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