diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2023-12-13 22:58:34 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-29 20:58:30 +0100 |
| commit | ee1b1d9b46f206ffdef5ebe4086d925a5c43805b (patch) | |
| tree | 40655add61b55abde7a7d2a8f2b67361c7153e3f | |
| parent | mm: pass a folio to swap_writepage_bdev_sync() (diff) | |
| download | linux-ee1b1d9b46f206ffdef5ebe4086d925a5c43805b.tar.xz linux-ee1b1d9b46f206ffdef5ebe4086d925a5c43805b.zip | |
mm: pass a folio to swap_writepage_bdev_async()
Saves a call to compound_head().
Link: https://lkml.kernel.org/r/20231213215842.671461-6-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | mm/page_io.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index 1f57e26fa282..454ab67b33e3 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -347,18 +347,17 @@ static void swap_writepage_bdev_sync(struct folio *folio, __end_swap_bio_write(&bio); } -static void swap_writepage_bdev_async(struct page *page, +static void swap_writepage_bdev_async(struct folio *folio, struct writeback_control *wbc, struct swap_info_struct *sis) { struct bio *bio; - struct folio *folio = page_folio(page); bio = bio_alloc(sis->bdev, 1, REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc), GFP_NOIO); - bio->bi_iter.bi_sector = swap_page_sector(page); + bio->bi_iter.bi_sector = swap_page_sector(&folio->page); bio->bi_end_io = end_swap_bio_write; - __bio_add_page(bio, page, thp_size(page), 0); + bio_add_folio_nofail(bio, folio, folio_size(folio), 0); bio_associate_blkg_from_page(bio, folio); count_swpout_vm_event(folio); @@ -382,7 +381,7 @@ void __swap_writepage(struct folio *folio, struct writeback_control *wbc) else if (sis->flags & SWP_SYNCHRONOUS_IO) swap_writepage_bdev_sync(folio, wbc, sis); else - swap_writepage_bdev_async(&folio->page, wbc, sis); + swap_writepage_bdev_async(folio, wbc, sis); } void swap_write_unplug(struct swap_iocb *sio) |