diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-10-19 19:33:30 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-11-08 17:37:18 -0800 |
| commit | dd8095b15a6034165bc48da1eb6d0acc73c1558a (patch) | |
| tree | 4ada6b2c0c8256221b88eb39024182e86a38a3b9 /mm | |
| parent | 9ee2c086271639d82ad8f6e96b91fa7991800c0a (diff) | |
mm/swap: convert find_get_incore_page to use folios
Eliminates a use of FGP_HEAD and saves 35 bytes of text.
Link: https://lkml.kernel.org/r/20221019183332.2802139-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swap_state.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/mm/swap_state.c b/mm/swap_state.c index 438d0676c5be..44e3530520e8 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -386,17 +386,14 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index) { swp_entry_t swp; struct swap_info_struct *si; - struct page *page = pagecache_get_page(mapping, index, - FGP_ENTRY | FGP_HEAD, 0); + struct folio *folio = __filemap_get_folio(mapping, index, FGP_ENTRY, 0); - if (!page) - return page; - if (!xa_is_value(page)) - return find_subpage(page, index); + if (!xa_is_value(folio)) + goto out; if (!shmem_mapping(mapping)) return NULL; - swp = radix_to_swp_entry(page); + swp = radix_to_swp_entry(folio); /* There might be swapin error entries in shmem mapping. */ if (non_swap_entry(swp)) return NULL; @@ -404,9 +401,13 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index) si = get_swap_device(swp); if (!si) return NULL; - page = find_get_page(swap_address_space(swp), swp_offset(swp)); + index = swp_offset(swp); + folio = filemap_get_folio(swap_address_space(swp), index); put_swap_device(si); - return page; +out: + if (!folio) + return NULL; + return folio_file_page(folio, index); } struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, |