From: Dan Williams <dan.j.williams@intel.com>
To: Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>,
Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
"Dan Williams" <dan.j.williams@intel.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Dave Jiang <dave.jiang@intel.com>,
Ira Weiny <ira.weiny@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
<linux-block@vger.kernel.org>, <nvdimm@lists.linux.dev>,
<linux-fsdevel@vger.kernel.org>, <linux-mm@kvack.org>
Subject: RE: [PATCH 2/7] mm: remove the swap_readpage return value
Date: Wed, 25 Jan 2023 10:00:03 -0800 [thread overview]
Message-ID: <63d16e23ae4a_3a36e529425@dwillia2-xfh.jf.intel.com.notmuch> (raw)
In-Reply-To: <20230125133436.447864-3-hch@lst.de>
Christoph Hellwig wrote:
> swap_readpage always returns 0, and no caller checks the return value.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> mm/page_io.c | 16 +++++-----------
> mm/swap.h | 7 +++----
> 2 files changed, 8 insertions(+), 15 deletions(-)
>
> diff --git a/mm/page_io.c b/mm/page_io.c
> index 3a5f921b932e82..6f7166fdc4b2bb 100644
> --- a/mm/page_io.c
> +++ b/mm/page_io.c
> @@ -445,11 +445,9 @@ static void swap_readpage_fs(struct page *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;
> @@ -481,15 +479,12 @@ int swap_readpage(struct page *page, bool synchronous,
> 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;
> @@ -521,7 +516,6 @@ int swap_readpage(struct page *page, bool synchronous,
> psi_memstall_leave(&pflags);
> }
> delayacct_swapin_end();
> - return ret;
> }
>
> void __swap_read_unplug(struct swap_iocb *sio)
> diff --git a/mm/swap.h b/mm/swap.h
> index f78065c8ef524b..f5eb5069d28c2e 100644
> --- a/mm/swap.h
> +++ b/mm/swap.h
> @@ -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,8 +63,8 @@ static inline unsigned int folio_swap_flags(struct folio *folio)
> }
> #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;
> }
> --
> 2.39.0
>
Looks correct,
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
next prev parent reply other threads:[~2023-01-25 18:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 13:34 remove ->rw_page Christoph Hellwig
2023-01-25 13:34 ` [PATCH 1/7] mpage: stop using bdev_{read,write}_page Christoph Hellwig
2023-01-25 17:58 ` Dan Williams
2023-01-25 13:34 ` [PATCH 2/7] mm: remove the swap_readpage return value Christoph Hellwig
2023-01-25 15:58 ` Keith Busch
2023-01-26 5:30 ` Christoph Hellwig
2023-01-25 18:00 ` Dan Williams [this message]
2023-01-25 13:34 ` [PATCH 3/7] mm: factor out a swap_readpage_bdev helper Christoph Hellwig
2023-01-25 18:30 ` Dan Williams
2023-01-25 13:34 ` [PATCH 4/7] mm: use an on-stack bio for synchronous swapin Christoph Hellwig
2023-01-25 13:34 ` [PATCH 5/7] mm: remove the __swap_writepage return value Christoph Hellwig
2023-01-25 13:34 ` [PATCH 6/7] mm: factor out a swap_writepage_bdev helper Christoph Hellwig
2023-01-25 13:34 ` [PATCH 7/7] block: remove ->rw_page Christoph Hellwig
2023-01-25 16:28 ` Keith Busch
2023-01-26 5:30 ` Christoph Hellwig
2023-01-25 18:38 ` Dan Williams
2023-01-25 14:32 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=63d16e23ae4a_3a36e529425@dwillia2-xfh.jf.intel.com.notmuch \
--to=dan.j.williams@intel.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=dave.jiang@intel.com \
--cc=hch@lst.de \
--cc=ira.weiny@intel.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=senozhatsky@chromium.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.