diff options
| author |  Matthew Wilcox (Oracle) <willy@infradead.org>
| 2023-12-13 21:58:42 +0000 |
|---|---|---|
| committer |  Andrew Morton <akpm@linux-foundation.org>
| 2023-12-29 11:58:32 -0800 |
| commit | a4575c4138db887bd27dc7f87cf7cfb0224c6f5e (patch) | |
| tree | caf1b69628705d083bb756e7d00f94e6be1d1624 /mm/swap.h | |
| parent | mm: return a folio from read_swap_cache_async() (diff) | |
| download | linux-a4575c4138db887bd27dc7f87cf7cfb0224c6f5e.tar.gz linux-a4575c4138db887bd27dc7f87cf7cfb0224c6f5e.tar.bz2 linux-a4575c4138db887bd27dc7f87cf7cfb0224c6f5e.zip | |
mm: convert swap_cluster_readahead and swap_vma_readahead to return a folio
shmem_swapin_cluster() immediately converts the page back to a folio, and
swapin_readahead() may as well call folio_file_page() once instead of
having each function call it.
[willy@infradead.org: avoid NULL pointer deref]
Link: https://lkml.kernel.org/r/ZYI7OcVlM1voKfBl@casper.infradead.org
Link: https://lkml.kernel.org/r/20231213215842.671461-14-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/swap.h')
| -rw-r--r-- | mm/swap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/swap.h b/mm/swap.h index 82c68ccb5ab1..758c46ca671e 100644 --- a/mm/swap.h +++ b/mm/swap.h @@ -52,8 +52,8 @@ struct folio *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, struct folio *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_flags, struct mempolicy *mpol, pgoff_t ilx, bool *new_page_allocated, bool skip_if_exists); -struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t flag, - struct mempolicy *mpol, pgoff_t ilx); +struct folio *swap_cluster_readahead(swp_entry_t entry, gfp_t flag, + struct mempolicy *mpol, pgoff_t ilx); struct page *swapin_readahead(swp_entry_t entry, gfp_t flag, struct vm_fault *vmf); @@ -80,7 +80,7 @@ static inline void show_swap_cache_info(void) { } -static inline struct page *swap_cluster_readahead(swp_entry_t entry, +static inline struct folio *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask, struct mempolicy *mpol, pgoff_t ilx) { return NULL; |