On Thu, Aug 12, 2021 at 09:22:15PM +0100, David Howells wrote:

Remove the callback func argument from __swap_writepage() as it's
end_swap_bio_write() in both places that call it.

Yeah.  I actually had a similar patch in a WIP tree for a while but
never got to end it out.

 /* linux/mm/page_io.c */
 extern int swap_readpage(struct page *page, bool do_poll);
 extern int swap_writepage(struct page *page, struct writeback_control *wbc);
-extern void end_swap_bio_write(struct bio *bio);
-extern int __swap_writepage(struct page *page, struct writeback_control *wbc,
-	bio_end_io_t end_write_func);
+extern int __swap_writepage(struct page *page, struct writeback_control *wbc);

Please also drop the extern while you're at it.

With that:

Reviewed-by: Christoph Hellwig <hch@lst.de>