From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-fsdevel@vger.kernel.org, gfs2@lists.linux.dev,
linux-nilfs@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev,
ocfs2-devel@lists.linux.dev, reiserfs-devel@vger.kernel.org,
linux-ext4@vger.kernel.org, Pankaj Raghav <p.raghav@samsung.com>,
Ryusuke Konishi <konishi.ryusuke@gmail.com>
Subject: [PATCH v2 11/27] nilfs2: Convert nilfs_grab_buffer() to use a folio
Date: Mon, 16 Oct 2023 21:10:58 +0100 [thread overview]
Message-ID: <20231016201114.1928083-12-willy@infradead.org> (raw)
In-Reply-To: <20231016201114.1928083-1-willy@infradead.org>
Remove a number of folio->page->folio conversions.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
---
fs/nilfs2/page.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index b4e54d079b7d..1c075bd906c9 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -25,19 +25,19 @@
(BIT(BH_Uptodate) | BIT(BH_Mapped) | BIT(BH_NILFS_Node) | \
BIT(BH_NILFS_Volatile) | BIT(BH_NILFS_Checked))
-static struct buffer_head *
-__nilfs_get_page_block(struct page *page, unsigned long block, pgoff_t index,
- int blkbits, unsigned long b_state)
+static struct buffer_head *__nilfs_get_folio_block(struct folio *folio,
+ unsigned long block, pgoff_t index, int blkbits,
+ unsigned long b_state)
{
unsigned long first_block;
- struct buffer_head *bh;
+ struct buffer_head *bh = folio_buffers(folio);
- if (!page_has_buffers(page))
- create_empty_buffers(page, 1 << blkbits, b_state);
+ if (!bh)
+ bh = folio_create_empty_buffers(folio, 1 << blkbits, b_state);
first_block = (unsigned long)index << (PAGE_SHIFT - blkbits);
- bh = nilfs_page_get_nth_block(page, block - first_block);
+ bh = get_nth_bh(bh, block - first_block);
touch_buffer(bh);
wait_on_buffer(bh);
@@ -51,17 +51,17 @@ struct buffer_head *nilfs_grab_buffer(struct inode *inode,
{
int blkbits = inode->i_blkbits;
pgoff_t index = blkoff >> (PAGE_SHIFT - blkbits);
- struct page *page;
+ struct folio *folio;
struct buffer_head *bh;
- page = grab_cache_page(mapping, index);
- if (unlikely(!page))
+ folio = filemap_grab_folio(mapping, index);
+ if (IS_ERR(folio))
return NULL;
- bh = __nilfs_get_page_block(page, blkoff, index, blkbits, b_state);
+ bh = __nilfs_get_folio_block(folio, blkoff, index, blkbits, b_state);
if (unlikely(!bh)) {
- unlock_page(page);
- put_page(page);
+ folio_unlock(folio);
+ folio_put(folio);
return NULL;
}
return bh;
--
2.40.1
next prev parent reply other threads:[~2023-10-16 20:11 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-16 20:10 [PATCH v2 00/27] Finish the create_empty_buffers() transition Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 01/27] buffer: Return bool from grow_dev_folio() Matthew Wilcox (Oracle)
2023-10-17 19:41 ` Ryusuke Konishi
2023-10-18 14:19 ` Matthew Wilcox
2023-10-16 20:10 ` [PATCH v2 02/27] buffer: Make folio_create_empty_buffers() return a buffer_head Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 03/27] mpage: Convert map_buffer_to_folio() to folio_create_empty_buffers() Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 04/27] ext4: Convert to folio_create_empty_buffers Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 05/27] buffer: Add get_nth_bh() Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 06/27] gfs2: Convert inode unstuffing to use a folio Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 07/27] gfs2: Convert gfs2_getbuf() to folios Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 08/27] gfs2: Convert gfs2_getjdatabuf to use a folio Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 09/27] gfs2: Convert gfs2_write_buf_to_page() " Matthew Wilcox (Oracle)
2023-10-16 20:10 ` [PATCH v2 10/27] nilfs2: Convert nilfs_mdt_freeze_buffer " Matthew Wilcox (Oracle)
2023-10-16 20:10 ` Matthew Wilcox (Oracle) [this message]
2023-10-16 20:10 ` [PATCH v2 12/27] nilfs2: Convert nilfs_copy_page() to nilfs_copy_folio() Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 13/27] nilfs2: Convert nilfs_mdt_forget_block() to use a folio Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 14/27] nilfs2: Convert nilfs_mdt_get_frozen_buffer " Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 15/27] nilfs2: Remove nilfs_page_get_nth_block Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 16/27] nilfs2: Convert nilfs_lookup_dirty_data_buffers to use folio_create_empty_buffers Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 17/27] ntfs: Convert ntfs_read_block() to use a folio Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 18/27] ntfs: Convert ntfs_writepage " Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 19/27] ntfs: Convert ntfs_prepare_pages_for_non_resident_write() to folios Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 20/27] ntfs3: Convert ntfs_zero_range() to use a folio Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 21/27] ocfs2: Convert ocfs2_map_page_blocks " Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 22/27] reiserfs: Convert writepage " Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 23/27] ufs: Add ufs_get_locked_folio and ufs_put_locked_folio Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 24/27] ufs: Use ufs_get_locked_folio() in ufs_alloc_lastblock() Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 25/27] ufs; Convert ufs_change_blocknr() to use folios Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 26/27] ufs: Remove ufs_get_locked_page() Matthew Wilcox (Oracle)
2023-10-16 20:11 ` [PATCH v2 27/27] buffer: Remove folio_create_empty_buffers() Matthew Wilcox (Oracle)
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=20231016201114.1928083-12-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=gfs2@lists.linux.dev \
--cc=konishi.ryusuke@gmail.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=ntfs3@lists.linux.dev \
--cc=ocfs2-devel@lists.linux.dev \
--cc=p.raghav@samsung.com \
--cc=reiserfs-devel@vger.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 read-only IMAP folder(s) and NNTP newsgroup(s).