From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
cluster-devel@redhat.com, Hannes Reinecke <hare@suse.com>,
Luis Chamberlain <mcgrof@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v3 13/14] buffer: Use a folio in __find_get_block_slow()
Date: Mon, 12 Jun 2023 22:01:40 +0100 [thread overview]
Message-ID: <20230612210141.730128-14-willy@infradead.org> (raw)
In-Reply-To: <20230612210141.730128-1-willy@infradead.org>
Saves a call to compound_head() and may be needed to support
block size > PAGE_SIZE.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/buffer.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/buffer.c b/fs/buffer.c
index 4ca2eb2b3dca..c38fdcaa32ff 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -195,19 +195,19 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
pgoff_t index;
struct buffer_head *bh;
struct buffer_head *head;
- struct page *page;
+ struct folio *folio;
int all_mapped = 1;
static DEFINE_RATELIMIT_STATE(last_warned, HZ, 1);
index = block >> (PAGE_SHIFT - bd_inode->i_blkbits);
- page = find_get_page_flags(bd_mapping, index, FGP_ACCESSED);
- if (!page)
+ folio = __filemap_get_folio(bd_mapping, index, FGP_ACCESSED, 0);
+ if (IS_ERR(folio))
goto out;
spin_lock(&bd_mapping->private_lock);
- if (!page_has_buffers(page))
+ head = folio_buffers(folio);
+ if (!head)
goto out_unlock;
- head = page_buffers(page);
bh = head;
do {
if (!buffer_mapped(bh))
@@ -237,7 +237,7 @@ __find_get_block_slow(struct block_device *bdev, sector_t block)
}
out_unlock:
spin_unlock(&bd_mapping->private_lock);
- put_page(page);
+ folio_put(folio);
out:
return ret;
}
--
2.39.2
next prev parent reply other threads:[~2023-06-12 21:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 21:01 [PATCH v3 00/14] gfs2/buffer folio changes for 6.5 Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 01/14] gfs2: Use a folio inside gfs2_jdata_writepage() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 02/14] gfs2: Pass a folio to __gfs2_jdata_write_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 03/14] gfs2: Convert gfs2_write_jdata_page() to gfs2_write_jdata_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 04/14] buffer: Convert __block_write_full_page() to __block_write_full_folio() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 05/14] gfs2: Support ludicrously large folios in gfs2_trans_add_databufs() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 06/14] buffer: Make block_write_full_page() handle large folios correctly Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 07/14] buffer: Convert block_page_mkwrite() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 08/14] buffer: Convert __block_commit_write() to take " Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 09/14] buffer: Convert page_zero_new_buffers() to folio_zero_new_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 10/14] buffer: Convert grow_dev_page() to use a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 11/14] buffer: Convert init_page_buffers() to folio_init_buffers() Matthew Wilcox (Oracle)
2023-06-12 21:01 ` [PATCH v3 12/14] buffer: Convert link_dev_buffers to take a folio Matthew Wilcox (Oracle)
2023-06-12 21:01 ` Matthew Wilcox (Oracle) [this message]
2023-06-12 21:01 ` [PATCH v3 14/14] buffer: Convert block_truncate_page() to use " Matthew Wilcox (Oracle)
2023-06-12 21:28 ` [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-14-willy@infradead.org \
--to=willy@infradead.org \
--cc=agruenba@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=cluster-devel@redhat.com \
--cc=hare@suse.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=mcgrof@kernel.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).