ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

swapfile: convert try_to_unuse() to use a folio

Browse Source 
Saves five calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-35-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-09-02 20:46:30 +01:00
committed by Andrew Morton
parent 923e2f0e7c
commit 000085b9af
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mm/swapfile.c
View File

@@ -2032,7 +2032,7 @@ static int try_to_unuse(unsigned int type)
struct list_head *p; struct list_head *p;
int retval = 0; int retval = 0;
struct swap_info_struct *si = swap_info[type]; struct swap_info_struct *si = swap_info[type];
struct page *page; struct folio *folio;
swp_entry_t entry; swp_entry_t entry;
unsigned int i; unsigned int i;
@@ -2082,21 +2082,21 @@ retry:
(i = find_next_to_unuse(si, i)) != 0) { (i = find_next_to_unuse(si, i)) != 0) {
entry = swp_entry(type, i); entry = swp_entry(type, i);
page = find_get_page(swap_address_space(entry), i); folio = filemap_get_folio(swap_address_space(entry), i);
if (!page) if (!folio)
continue; continue;
/* /*
* It is conceivable that a racing task removed this page from * It is conceivable that a racing task removed this folio from
* swap cache just before we acquired the page lock. The page * swap cache just before we acquired the page lock. The folio
* might even be back in swap cache on another swap area. But * might even be back in swap cache on another swap area. But
* that is okay, try_to_free_swap() only removes stale pages. * that is okay, folio_free_swap() only removes stale folios.
*/ */
lock_page(page); folio_lock(folio);
wait_on_page_writeback(page); folio_wait_writeback(folio);
try_to_free_swap(page); folio_free_swap(folio);
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
} }
/* /*