From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>
Cc: <willy@infradead.org>, <sidhartha.kumar@oracle.com>,
<akpm@linux-foundation.org>, <wangkefeng.wang@huawei.com>,
<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH 2/6] mm/page_io: use a folio in sio_read_complete()
Date: Mon, 17 Jul 2023 21:25:58 +0800 [thread overview]
Message-ID: <20230717132602.2202147-3-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230717132602.2202147-1-zhangpeng362@huawei.com>
From: ZhangPeng <zhangpeng362@huawei.com>
Saves three implicit call to compound_head().
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
mm/page_io.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/mm/page_io.c b/mm/page_io.c
index ebf431e5f538..438d0c7c2194 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -406,19 +406,19 @@ static void sio_read_complete(struct kiocb *iocb, long ret)
if (ret == sio->len) {
for (p = 0; p < sio->pages; p++) {
- struct page *page = sio->bvec[p].bv_page;
+ struct folio *folio = page_folio(sio->bvec[p].bv_page);
- SetPageUptodate(page);
- unlock_page(page);
+ folio_mark_uptodate(folio);
+ folio_unlock(folio);
}
count_vm_events(PSWPIN, sio->pages);
} else {
for (p = 0; p < sio->pages; p++) {
- struct page *page = sio->bvec[p].bv_page;
+ struct folio *folio = page_folio(sio->bvec[p].bv_page);
- SetPageError(page);
- ClearPageUptodate(page);
- unlock_page(page);
+ folio_set_error(folio);
+ folio_clear_uptodate(folio);
+ folio_unlock(folio);
}
pr_alert_ratelimited("Read-error on swap-device\n");
}
--
2.25.1
next prev parent reply other threads:[~2023-07-17 13:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 13:25 [PATCH 0/6] Convert several functions in page_io.c to use a folio Peng Zhang
2023-07-17 13:25 ` [PATCH 1/6] mm/page_io: use a folio in __end_swap_bio_read() Peng Zhang
2023-07-17 13:34 ` Matthew Wilcox
2023-07-18 12:56 ` zhangpeng (AS)
2023-07-18 16:16 ` Matthew Wilcox
2023-07-19 7:46 ` zhangpeng (AS)
2023-07-20 5:21 ` Christoph Hellwig
2023-07-17 13:25 ` Peng Zhang [this message]
2023-07-17 13:40 ` [PATCH 2/6] mm/page_io: use a folio in sio_read_complete() Matthew Wilcox
2023-07-18 12:58 ` zhangpeng (AS)
2023-07-18 16:21 ` Matthew Wilcox
2023-07-19 7:47 ` zhangpeng (AS)
2023-07-20 5:22 ` Christoph Hellwig
2023-07-17 13:25 ` [PATCH 3/6] mm/page_io: use a folio in swap_writepage_bdev_sync() Peng Zhang
2023-07-17 14:00 ` Matthew Wilcox
2023-07-17 13:26 ` [PATCH 4/6] mm/page_io: use a folio in swap_writepage_bdev_async() Peng Zhang
2023-07-17 14:01 ` Matthew Wilcox
2023-07-17 13:26 ` [PATCH 5/6] mm/page_io: convert count_swpout_vm_event() to take in a folio Peng Zhang
2023-07-17 13:48 ` Matthew Wilcox
2023-07-18 12:56 ` zhangpeng (AS)
2023-07-17 13:26 ` [PATCH 6/6] mm/page_io: convert bio_associate_blkg_from_page() " Peng Zhang
2023-07-17 13:46 ` Matthew Wilcox
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=20230717132602.2202147-3-zhangpeng362@huawei.com \
--to=zhangpeng362@huawei.com \
--cc=akpm@linux-foundation.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