diff mbox series

[04/35] nilfs2: Convert nilfs_forget_buffer to use a folio

Message ID	20231106173903.1734114-5-willy@infradead.org (mailing list archive)
State	New, archived
Headers	show Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1C752D02A for <linux-fsdevel@vger.kernel.org>; Mon, 6 Nov 2023 17:39:18 +0000 (UTC) From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-nilfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 04/35] nilfs2: Convert nilfs_forget_buffer to use a folio Date: Mon, 6 Nov 2023 17:38:32 +0000 Message-Id: <20231106173903.1734114-5-willy@infradead.org> In-Reply-To: <20231106173903.1734114-1-willy@infradead.org> References: <20231106173903.1734114-1-willy@infradead.org> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	nilfs2: Folio conversions \| expand [00/35] nilfs2: Folio conversions [01/35] nilfs2: Add nilfs_end_folio_io() [02/35] nilfs2: Convert nilfs_abort_logs to use folios [03/35] nilfs2: Convert nilfs_segctor_complete_write to use folios [04/35] nilfs2: Convert nilfs_forget_buffer to use a folio [05/35] nilfs2: Convert to nilfs_folio_buffers_clean() [06/35] nilfs2: Convert nilfs_writepage() to use a folio [07/35] nilfs2: Convert nilfs_mdt_write_page() to use a folio [08/35] nilfs2: Convert to nilfs_clear_folio_dirty() [09/35] nilfs2: Convert to __nilfs_clear_folio_dirty() [10/35] nilfs2: Convert nilfs_segctor_prepare_write to use folios [11/35] nilfs2: Convert nilfs_page_mkwrite() to use a folio [12/35] nilfs2: Convert nilfs_mdt_create_block to use a folio [13/35] nilfs2: Convert nilfs_mdt_submit_block to use a folio [14/35] nilfs2: Convert nilfs_gccache_submit_read_data to use a folio [15/35] nilfs2: Convert nilfs_btnode_create_block to use a folio [16/35] nilfs2: Convert nilfs_btnode_submit_block to use a folio [17/35] nilfs2: Convert nilfs_btnode_delete to use a folio [18/35] nilfs2: Convert nilfs_btnode_prepare_change_key to use a folio [19/35] nilfs2: Convert nilfs_btnode_commit_change_key to use a folio [20/35] nilfs2: Convert nilfs_btnode_abort_change_key to use a folio [21/35] nilfs2: Remove page_address() from nilfs_set_link [22/35] nilfs2: Remove page_address() from nilfs_add_link [23/35] nilfs2: Remove page_address() from nilfs_delete_entry [24/35] nilfs2: Return the mapped address from nilfs_get_page() [25/35] nilfs2: Pass the mapped address to nilfs_check_page() [26/35] nilfs2: Switch to kmap_local for directory handling [27/35] nilfs2: Add nilfs_get_folio() [28/35] nilfs2: Convert nilfs_readdir to use a folio [29/35] nilfs2: Convert nilfs_find_entry to use a folio [30/35] nilfs2: Convert nilfs_rename() to use folios [31/35] nilfs2: Convert nilfs_add_link() to use a folio [32/35] nilfs2: Convert nilfs_empty_dir() to use a folio [33/35] nilfs2: Convert nilfs_make_empty() to use a folio [34/35] nilfs2: Convert nilfs_prepare_chunk() and nilfs_commit_chunk() to folios [35/35] nilfs2: Convert nilfs_page_bug() to nilfs_folio_bug()

Commit Message

Matthew Wilcox Nov. 6, 2023, 5:38 p.m. UTC

Save two hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/nilfs2/page.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff mbox series

Patch

diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 06b04758f289..3882acde1b3e 100644
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -73,7 +73,7 @@  struct buffer_head *nilfs_grab_buffer(struct inode *inode,
  */
 void nilfs_forget_buffer(struct buffer_head *bh)
 {
-	struct page *page = bh->b_page;
+	struct folio *folio = bh->b_folio;
 	const unsigned long clear_bits =
 		(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
 		 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
@@ -81,12 +81,12 @@  void nilfs_forget_buffer(struct buffer_head *bh)
 
 	lock_buffer(bh);
 	set_mask_bits(&bh->b_state, clear_bits, 0);
-	if (nilfs_page_buffers_clean(page))
-		__nilfs_clear_page_dirty(page);
+	if (nilfs_page_buffers_clean(&folio->page))
+		__nilfs_clear_page_dirty(&folio->page);
 
 	bh->b_blocknr = -1;
-	ClearPageUptodate(page);
-	ClearPageMappedToDisk(page);
+	folio_clear_uptodate(folio);
+	folio_clear_mappedtodisk(folio);
 	unlock_buffer(bh);
 	brelse(bh);
 }