mm-remove-the-swap_readpage-return-value.patch removed from -mm tree
The quilt patch titled
Subject: mm: remove the swap_readpage return value
has been removed from the -mm tree. Its filename was
mm-remove-the-swap_readpage-return-value.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: remove the swap_readpage return value
Date: Wed, 25 Jan 2023 14:34:31 +0100
swap_readpage always returns 0, and no caller checks the return value.
[[email protected]: fix void-returning swap_readpage() stub, per Keith]
Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Dan Williams <[email protected]>
Cc Dave Jiang <[email protected]>
Cc Ira Weiny <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Keith Busch <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Sergey Senozhatsky <[email protected]>
Cc Vishal Verma <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/page_io.c renamed from mm/page_io.c~mm-remove-the-swap_readpage-return-value +5 -11
@@ -444,11 +444,9 @@ static void swap_readpage_fs(struct page *plug = sio; } -int swap_readpage (struct page *page,bool synchronous, -struct swap_iocb **plug) +void swap_readpage (struct page *page,bool synchronous,struct swap_iocb **plug) {struct bio *bio; -int ret =0 ;struct swap_info_struct *sis =page_swap_info (page);bool workingset =PageWorkingset (page);unsigned long pflags;
@@ -480,15 +478,12 @@ int swap_readpage(struct page *page, boo goto out; } -if (sis->flags &SWP_SYNCHRONOUS_IO ) { - ret =bdev_read_page (sis->bdev,swap_page_sector (page), page); -if (!ret) { -count_vm_event (PSWPIN ); - goto out; - } +if ((sis->flags &SWP_SYNCHRONOUS_IO ) && + !bdev_read_page (sis->bdev,swap_page_sector (page), page)) { +count_vm_event (PSWPIN ); + goto out; } - ret =0 ; bio =bio_alloc (sis->bdev,1 ,REQ_OP_READ ,GFP_KERNEL ); bio->bi_iter.bi_sector =swap_page_sector (page); bio->bi_end_io = end_swap_bio_read;
@@ -520,7 +515,6 @@ out:psi_memstall_leave (&pflags); }delayacct_swapin_end (); -return ret; }void __swap_read_unplug (struct swap_iocb *sio)
mm/swap.h renamed from mm/swap.h~mm-remove-the-swap_readpage-return-value +3 -5
@@ -8,8 +8,7 @@/* linux/mm/page_io.c */ int sio_pool_init (void );struct swap_iocb ; -int swap_readpage (struct page *page,bool do_poll, -struct swap_iocb **plug); +void swap_readpage (struct page *page,bool do_poll,struct swap_iocb **plug);void __swap_read_unplug (struct swap_iocb *plug);static inline void swap_read_unplug (struct swap_iocb *plug) {
@@ -64,10 +63,9 @@ static inline unsigned int folio_swap_fl }#else /* CONFIG_SWAP */ struct swap_iocb ; -static inline int swap_readpage (struct page *page,bool do_poll, -struct swap_iocb **plug) +static inline void swap_readpage (struct page *page,bool do_poll, +struct swap_iocb **plug) { -return 0 ; }static inline void swap_write_unplug (struct swap_iocb *sio) {
_
Patches currently in -mm which might be from [email protected] are