linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<willy@infradead.org>
Cc: <hch@infradead.org>, <sidhartha.kumar@oracle.com>,
	<akpm@linux-foundation.org>, <wangkefeng.wang@huawei.com>,
	<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH v3 05/10] mm/page_io: use a folio in __end_swap_bio_read()
Date: Thu, 20 Jul 2023 21:01:42 +0800	[thread overview]
Message-ID: <20230720130147.4071649-6-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230720130147.4071649-1-zhangpeng362@huawei.com>

From: ZhangPeng <zhangpeng362@huawei.com>

Saves one implicit call to compound_head().

Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
 mm/page_io.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/page_io.c b/mm/page_io.c
index d9f5fa5b7281..3b97289153f9 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -57,16 +57,16 @@ static void end_swap_bio_write(struct bio *bio)
 
 static void __end_swap_bio_read(struct bio *bio)
 {
-	struct page *page = bio_first_page_all(bio);
+	struct folio *folio = bio_first_folio_all(bio);
 
 	if (bio->bi_status) {
 		pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n",
 				     MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)),
 				     (unsigned long long)bio->bi_iter.bi_sector);
 	} else {
-		SetPageUptodate(page);
+		folio_mark_uptodate(folio);
 	}
-	unlock_page(page);
+	folio_unlock(folio);
 }
 
 static void end_swap_bio_read(struct bio *bio)
-- 
2.25.1



  parent reply	other threads:[~2023-07-20 13:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-20 13:01 [PATCH v3 00/10] Convert several functions in page_io.c to use a folio Peng Zhang
2023-07-20 13:01 ` [PATCH v3 01/10] mm/page_io: remove unneeded ClearPageUptodate() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 02/10] mm/page_io: remove unneeded SetPageError() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 03/10] mm/page_io: introduce bio_first_folio_all() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 04/10] mm/page_io: use a folio in __end_swap_bio_write() Peng Zhang
2023-07-20 13:01 ` Peng Zhang [this message]
2023-07-20 13:01 ` [PATCH v3 06/10] mm/page_io: use a folio in sio_read_complete() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 07/10] mm/page_io: use a folio in swap_writepage_bdev_sync() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 08/10] mm/page_io: use a folio in swap_writepage_bdev_async() Peng Zhang
2023-07-20 13:01 ` [PATCH v3 09/10] mm/page_io: convert count_swpout_vm_event() to take in a folio Peng Zhang
2023-07-21  1:31   ` kernel test robot
2023-07-21  2:30     ` zhangpeng (AS)
2023-07-21  2:02   ` kernel test robot
2023-07-20 13:01 ` [PATCH v3 10/10] mm/page_io: convert bio_associate_blkg_from_page() " Peng Zhang

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=20230720130147.4071649-6-zhangpeng362@huawei.com \
    --to=zhangpeng362@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=hch@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=sidhartha.kumar@oracle.com \
    --cc=sunnanyong@huawei.com \
    --cc=wangkefeng.wang@huawei.com \
    --cc=willy@infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).