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

mm: pass a folio to swap_writepage_bdev_sync()

Saves a call to compound_head().

Link: https://lkml.kernel.org/r/20231213215842.671461-5-willy@infradead.orgSigned-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bfcd44d5
...@@ -326,17 +326,16 @@ static void swap_writepage_fs(struct folio *folio, struct writeback_control *wbc ...@@ -326,17 +326,16 @@ static void swap_writepage_fs(struct folio *folio, struct writeback_control *wbc
*wbc->swap_plug = sio; *wbc->swap_plug = sio;
} }
static void swap_writepage_bdev_sync(struct page *page, static void swap_writepage_bdev_sync(struct folio *folio,
struct writeback_control *wbc, struct swap_info_struct *sis) struct writeback_control *wbc, struct swap_info_struct *sis)
{ {
struct bio_vec bv; struct bio_vec bv;
struct bio bio; struct bio bio;
struct folio *folio = page_folio(page);
bio_init(&bio, sis->bdev, &bv, 1, bio_init(&bio, sis->bdev, &bv, 1,
REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc)); REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc));
bio.bi_iter.bi_sector = swap_page_sector(page); bio.bi_iter.bi_sector = swap_page_sector(&folio->page);
__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); bio_associate_blkg_from_page(&bio, folio);
count_swpout_vm_event(folio); count_swpout_vm_event(folio);
...@@ -381,7 +380,7 @@ void __swap_writepage(struct folio *folio, struct writeback_control *wbc) ...@@ -381,7 +380,7 @@ void __swap_writepage(struct folio *folio, struct writeback_control *wbc)
if (data_race(sis->flags & SWP_FS_OPS)) if (data_race(sis->flags & SWP_FS_OPS))
swap_writepage_fs(folio, 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, wbc, sis);
else else
swap_writepage_bdev_async(&folio->page, wbc, sis); swap_writepage_bdev_async(&folio->page, wbc, sis);
} }
......
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