From: Matthew Wilcox (Oracle) <willy@infradead.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH v3 11/14] buffer: Convert init_page_buffers() to folio_init_buffers()
Date: Mon, 12 Jun 2023 22:01:38 +0100 [thread overview]
Message-ID: <20230612210141.730128-12-willy@infradead.org> (raw)
In-Reply-To: <20230612210141.730128-1-willy@infradead.org>
Use the folio API and pass the folio from both callers.
Saves a hidden call to compound_head().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/buffer.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index 06d031e28bee..9b9dee417467 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -934,15 +934,14 @@ static sector_t blkdev_max_block(struct block_device *bdev, unsigned int size)
}
/*
- * Initialise the state of a blockdev page's buffers.
+ * Initialise the state of a blockdev folio's buffers.
*/
-static sector_t
-init_page_buffers(struct page *page, struct block_device *bdev,
- sector_t block, int size)
+static sector_t folio_init_buffers(struct folio *folio,
+ struct block_device *bdev, sector_t block, int size)
{
- struct buffer_head *head = page_buffers(page);
+ struct buffer_head *head = folio_buffers(folio);
struct buffer_head *bh = head;
- int uptodate = PageUptodate(page);
+ bool uptodate = folio_test_uptodate(folio);
sector_t end_block = blkdev_max_block(bdev, size);
do {
@@ -998,9 +997,8 @@ grow_dev_page(struct block_device *bdev, sector_t block,
bh = folio_buffers(folio);
if (bh) {
if (bh->b_size == size) {
- end_block = init_page_buffers(&folio->page, bdev,
- (sector_t)index << sizebits,
- size);
+ end_block = folio_init_buffers(folio, bdev,
+ (sector_t)index << sizebits, size);
goto done;
}
if (!try_to_free_buffers(folio))
@@ -1016,7 +1014,7 @@ grow_dev_page(struct block_device *bdev, sector_t block,
*/
spin_lock(&inode->i_mapping->private_lock);
link_dev_buffers(&folio->page, bh);
- end_block = init_page_buffers(&folio->page, bdev,
+ end_block = folio_init_buffers(folio, bdev,
(sector_t)index << sizebits, size);
spin_unlock(&inode->i_mapping->private_lock);
done:
--
2.39.2
next prev parent reply other threads:[~2023-06-12 21:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 21:01 [Cluster-devel] [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 01/14] gfs2: Use a folio inside gfs2_jdata_writepage() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 02/14] gfs2: Pass a folio to __gfs2_jdata_write_folio() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 03/14] gfs2: Convert gfs2_write_jdata_page() to gfs2_write_jdata_folio() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 04/14] buffer: Convert __block_write_full_page() to __block_write_full_folio() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 05/14] gfs2: Support ludicrously large folios in gfs2_trans_add_databufs() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 06/14] buffer: Make block_write_full_page() handle large folios correctly Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 07/14] buffer: Convert block_page_mkwrite() to use a folio Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 08/14] buffer: Convert __block_commit_write() to take " Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 09/14] buffer: Convert page_zero_new_buffers() to folio_zero_new_buffers() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 10/14] buffer: Convert grow_dev_page() to use a folio Matthew Wilcox
2023-06-12 21:01 ` Matthew Wilcox [this message]
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 12/14] buffer: Convert link_dev_buffers to take " Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 13/14] buffer: Use a folio in __find_get_block_slow() Matthew Wilcox
2023-06-12 21:01 ` [Cluster-devel] [PATCH v3 14/14] buffer: Convert block_truncate_page() to use a folio Matthew Wilcox
2023-06-12 21:28 ` [Cluster-devel] [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Andreas Gruenbacher
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=20230612210141.730128-12-willy@infradead.org \
--to=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 read-only IMAP folder(s) and NNTP newsgroup(s).