Commit bfcd44d5 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton

mm: pass a folio to swap_writepage_fs()

Saves several calls to compound_head().

Link: https://lkml.kernel.org/r/20231213215842.671461-4-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b99b4e0d
...@@ -288,16 +288,16 @@ static void sio_write_complete(struct kiocb *iocb, long ret) ...@@ -288,16 +288,16 @@ static void sio_write_complete(struct kiocb *iocb, long ret)
mempool_free(sio, sio_pool); mempool_free(sio, sio_pool);
} }
static void swap_writepage_fs(struct page *page, struct writeback_control *wbc) static void swap_writepage_fs(struct folio *folio, struct writeback_control *wbc)
{ {
struct swap_iocb *sio = NULL; struct swap_iocb *sio = NULL;
struct swap_info_struct *sis = page_swap_info(page); struct swap_info_struct *sis = swp_swap_info(folio->swap);
struct file *swap_file = sis->swap_file; struct file *swap_file = sis->swap_file;
loff_t pos = page_file_offset(page); loff_t pos = folio_file_pos(folio);
count_swpout_vm_event(page_folio(page)); count_swpout_vm_event(folio);
set_page_writeback(page); folio_start_writeback(folio);
unlock_page(page); folio_unlock(folio);
if (wbc->swap_plug) if (wbc->swap_plug)
sio = *wbc->swap_plug; sio = *wbc->swap_plug;
if (sio) { if (sio) {
...@@ -315,8 +315,8 @@ static void swap_writepage_fs(struct page *page, struct writeback_control *wbc) ...@@ -315,8 +315,8 @@ static void swap_writepage_fs(struct page *page, struct writeback_control *wbc)
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) || !wbc->swap_plug) { if (sio->pages == ARRAY_SIZE(sio->bvec) || !wbc->swap_plug) {
swap_write_unplug(sio); swap_write_unplug(sio);
...@@ -379,7 +379,7 @@ void __swap_writepage(struct folio *folio, struct writeback_control *wbc) ...@@ -379,7 +379,7 @@ void __swap_writepage(struct folio *folio, struct writeback_control *wbc)
* is safe. * is safe.
*/ */
if (data_race(sis->flags & SWP_FS_OPS)) if (data_race(sis->flags & SWP_FS_OPS))
swap_writepage_fs(&folio->page, wbc); swap_writepage_fs(folio, wbc);
else if (sis->flags & SWP_SYNCHRONOUS_IO) else if (sis->flags & SWP_SYNCHRONOUS_IO)
swap_writepage_bdev_sync(&folio->page, wbc, sis); swap_writepage_bdev_sync(&folio->page, wbc, sis);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment