diff mbox series

[21/35] nilfs2: Remove page_address() from nilfs_set_link

Message ID	20231106173903.1734114-22-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 716412C874 for <linux-fsdevel@vger.kernel.org>; Mon, 6 Nov 2023 17:39:17 +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 21/35] nilfs2: Remove page_address() from nilfs_set_link Date: Mon, 6 Nov 2023 17:38:49 +0000 Message-Id: <20231106173903.1734114-22-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

In preparation for removing kmap from directory handling, use
offset_in_page() to calculate 'from'.  Matches ext2.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/nilfs2/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c
index de2073c47651..683101dcbddf 100644
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -417,7 +417,7 @@  ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)
 void nilfs_set_link(struct inode *dir, struct nilfs_dir_entry *de,
 		    struct page *page, struct inode *inode)
 {
-	unsigned int from = (char *)de - (char *)page_address(page);
+	unsigned int from = offset_in_page(de);
 	unsigned int to = from + nilfs_rec_len_from_disk(de->rec_len);
 	struct address_space *mapping = page->mapping;
 	int err;