Commit a8c1408f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton

mm: remove the swap_readpage return value

swap_readpage always returns 0, and no caller checks the return value.

[akpm@linux-foundation.org: fix void-returning swap_readpage() stub, per Keith]
Link: https://lkml.kernel.org/r/20230125133436.447864-3-hch@lst.deSigned-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7d286317
...@@ -444,11 +444,9 @@ static void swap_readpage_fs(struct page *page, ...@@ -444,11 +444,9 @@ static void swap_readpage_fs(struct page *page,
*plug = sio; *plug = sio;
} }
int swap_readpage(struct page *page, bool synchronous, void swap_readpage(struct page *page, bool synchronous, struct swap_iocb **plug)
struct swap_iocb **plug)
{ {
struct bio *bio; struct bio *bio;
int ret = 0;
struct swap_info_struct *sis = page_swap_info(page); struct swap_info_struct *sis = page_swap_info(page);
bool workingset = PageWorkingset(page); bool workingset = PageWorkingset(page);
unsigned long pflags; unsigned long pflags;
...@@ -480,15 +478,12 @@ int swap_readpage(struct page *page, bool synchronous, ...@@ -480,15 +478,12 @@ int swap_readpage(struct page *page, bool synchronous,
goto out; goto out;
} }
if (sis->flags & SWP_SYNCHRONOUS_IO) { if ((sis->flags & SWP_SYNCHRONOUS_IO) &&
ret = bdev_read_page(sis->bdev, swap_page_sector(page), page); !bdev_read_page(sis->bdev, swap_page_sector(page), page)) {
if (!ret) { count_vm_event(PSWPIN);
count_vm_event(PSWPIN); goto out;
goto out;
}
} }
ret = 0;
bio = bio_alloc(sis->bdev, 1, REQ_OP_READ, GFP_KERNEL); bio = bio_alloc(sis->bdev, 1, REQ_OP_READ, GFP_KERNEL);
bio->bi_iter.bi_sector = swap_page_sector(page); bio->bi_iter.bi_sector = swap_page_sector(page);
bio->bi_end_io = end_swap_bio_read; bio->bi_end_io = end_swap_bio_read;
...@@ -520,7 +515,6 @@ int swap_readpage(struct page *page, bool synchronous, ...@@ -520,7 +515,6 @@ int swap_readpage(struct page *page, bool synchronous,
psi_memstall_leave(&pflags); psi_memstall_leave(&pflags);
} }
delayacct_swapin_end(); delayacct_swapin_end();
return ret;
} }
void __swap_read_unplug(struct swap_iocb *sio) void __swap_read_unplug(struct swap_iocb *sio)
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
/* linux/mm/page_io.c */ /* linux/mm/page_io.c */
int sio_pool_init(void); int sio_pool_init(void);
struct swap_iocb; struct swap_iocb;
int swap_readpage(struct page *page, bool do_poll, void swap_readpage(struct page *page, bool do_poll, struct swap_iocb **plug);
struct swap_iocb **plug);
void __swap_read_unplug(struct swap_iocb *plug); void __swap_read_unplug(struct swap_iocb *plug);
static inline 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_flags(struct folio *folio) ...@@ -64,10 +63,9 @@ static inline unsigned int folio_swap_flags(struct folio *folio)
} }
#else /* CONFIG_SWAP */ #else /* CONFIG_SWAP */
struct swap_iocb; struct swap_iocb;
static inline int swap_readpage(struct page *page, bool do_poll, static inline void swap_readpage(struct page *page, bool do_poll,
struct swap_iocb **plug) struct swap_iocb **plug)
{ {
return 0;
} }
static inline void swap_write_unplug(struct swap_iocb *sio) static inline void swap_write_unplug(struct swap_iocb *sio)
{ {
......
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