summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-09-02 20:46:35 +0100
committerAndrew Morton <akpm@linux-foundation.org>2022-10-03 14:02:51 -0700
commitaedd74d4397a2b1a4882215b6169b47d139c0319 (patch)
treed7887769f5fc8416c970bd3c64994d8f9479dcfa
parentcb691e2f28bc63b1a872aa593dd542ee796e8364 (diff)
downloadlinux-stable-aedd74d4397a2b1a4882215b6169b47d139c0319.tar.gz
linux-stable-aedd74d4397a2b1a4882215b6169b47d139c0319.tar.bz2
linux-stable-aedd74d4397a2b1a4882215b6169b47d139c0319.zip
swap_state: convert free_swap_cache() to use a folio
Saves several calls to compound_head(). Link: https://lkml.kernel.org/r/20220902194653.1739778-40-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--mm/swap_state.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c
index 4af135a7b53c..438d0676c5be 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -272,16 +272,19 @@ void clear_shadow_from_swap_cache(int type, unsigned long begin,
/*
* If we are the only user, then try to free up the swap cache.
*
- * Its ok to check for PageSwapCache without the page lock
+ * Its ok to check the swapcache flag without the folio lock
* here because we are going to recheck again inside
- * try_to_free_swap() _with_ the lock.
+ * folio_free_swap() _with_ the lock.
* - Marcelo
*/
void free_swap_cache(struct page *page)
{
- if (PageSwapCache(page) && !page_mapped(page) && trylock_page(page)) {
- try_to_free_swap(page);
- unlock_page(page);
+ struct folio *folio = page_folio(page);
+
+ if (folio_test_swapcache(folio) && !folio_mapped(folio) &&
+ folio_trylock(folio)) {
+ folio_free_swap(folio);
+ folio_unlock(folio);
}
}