mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: pass a folio to swap_readpage_fs()

Browse source 
Saves a call to compound_head().

Link: https://lkml.kernel.org/r/20231213215842.671461-7-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) 2023-12-13 21:58:35 +00:00 committed by Andrew Morton
parent ee1b1d9b46
commit 64a24e55e3
1 changed files with 6 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

13
mm/page_io.c
View file

@ -420,12 +420,11 @@ static void sio_read_complete(struct kiocb *iocb, long ret)
mempool_free(sio, sio_pool); mempool_free(sio, sio_pool);
} }
static void swap_readpage_fs(struct page *page, static void swap_readpage_fs(struct folio *folio, struct swap_iocb **plug)
struct swap_iocb **plug)
{ {
struct swap_info_struct *sis = page_swap_info(page); struct swap_info_struct *sis = swp_swap_info(folio->swap);
struct swap_iocb *sio = NULL; struct swap_iocb *sio = NULL;
loff_t pos = page_file_offset(page); loff_t pos = folio_file_pos(folio);
if (plug) if (plug)
sio = *plug; sio = *plug;
@ -444,8 +443,8 @@ static void swap_readpage_fs(struct page *page,
sio->pages = 0; sio->pages = 0;
sio->len = 0; sio->len = 0;
} }
bvec_set_page(&sio->bvec[sio->pages], page, thp_size(page), 0); bvec_set_folio(&sio->bvec[sio->pages], folio, folio_size(folio), 0);
sio->len += thp_size(page); sio->len += folio_size(folio);
sio->pages += 1; sio->pages += 1;
if (sio->pages == ARRAY_SIZE(sio->bvec) || !plug) { if (sio->pages == ARRAY_SIZE(sio->bvec) || !plug) {
swap_read_unplug(sio); swap_read_unplug(sio);
@ -515,7 +514,7 @@ void swap_readpage(struct page *page, bool synchronous, struct swap_iocb **plug)
folio_mark_uptodate(folio); folio_mark_uptodate(folio);
folio_unlock(folio); folio_unlock(folio);
} else if (data_race(sis->flags & SWP_FS_OPS)) { } else if (data_race(sis->flags & SWP_FS_OPS)) {
swap_readpage_fs(page, plug); swap_readpage_fs(folio, plug);
} else if (synchronous || (sis->flags & SWP_SYNCHRONOUS_IO)) { } else if (synchronous || (sis->flags & SWP_SYNCHRONOUS_IO)) {
swap_readpage_bdev_sync(page, sis); swap_readpage_bdev_sync(page, sis);
} else { } else {