bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm/swap: convert try_to_free_swap to use a folio

Browse source 
Save a few calls to compound_head by converting the passed page to
a folio.  Reduces kernel text size by 74 bytes.

Link: https://lkml.kernel.org/r/20220617175020.717127-13-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-06-17 18:50:10 +01:00 • committed by akpm
parent a2d33b5dd6
commit 2397f780e1
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mm/swapfile.c
View file

@ -1568,16 +1568,15 @@ unlock_out:
return ret; return ret;
} }
static bool page_swapped(struct page *page) static bool folio_swapped(struct folio *folio)
{ {
swp_entry_t entry; swp_entry_t entry;
struct swap_info_struct *si; struct swap_info_struct *si;
if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!PageTransCompound(page))) if (!IS_ENABLED(CONFIG_THP_SWAP) || likely(!folio_test_large(folio)))
return page_swapcount(page) != 0; return page_swapcount(&folio->page) != 0;
page = compound_head(page); entry = folio_swap_entry(folio);
entry.val = page_private(page);
si = _swap_info_get(entry); si = _swap_info_get(entry);
if (si) if (si)
return swap_page_trans_huge_swapped(si, entry); return swap_page_trans_huge_swapped(si, entry);
@ -1590,13 +1589,14 @@ static bool page_swapped(struct page *page)
*/ */
int try_to_free_swap(struct page *page) int try_to_free_swap(struct page *page)
{ {
VM_BUG_ON_PAGE(!PageLocked(page), page); struct folio *folio = page_folio(page);
VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio);
if (!PageSwapCache(page)) if (!folio_test_swapcache(folio))
return 0; return 0;
if (PageWriteback(page)) if (folio_test_writeback(folio))
return 0; return 0;
if (page_swapped(page)) if (folio_swapped(folio))
return 0; return 0;
/* /*
@ -1617,9 +1617,8 @@ int try_to_free_swap(struct page *page)
if (pm_suspended_storage()) if (pm_suspended_storage())
return 0; return 0;
page = compound_head(page); delete_from_swap_cache(&folio->page);
delete_from_swap_cache(page); folio_set_dirty(folio);
SetPageDirty(page);
return 1; return 1;
} }