diff mbox series

[04/17] nilfs2: Remove page_address() from nilfs_add_link

Message ID	20231127143036.2425-5-konishi.ryusuke@gmail.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; From: Ryusuke Konishi <konishi.ryusuke@gmail.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-nilfs@vger.kernel.org, Matthew Wilcox <willy@infradead.org>, linux-kernel@vger.kernel.org Subject: [PATCH 04/17] nilfs2: Remove page_address() from nilfs_add_link Date: Mon, 27 Nov 2023 23:30:23 +0900 Message-Id: <20231127143036.2425-5-konishi.ryusuke@gmail.com> In-Reply-To: <20231127143036.2425-1-konishi.ryusuke@gmail.com> References: <20231127143036.2425-1-konishi.ryusuke@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	nilfs2: Folio conversions for directory paths \| [00/17] nilfs2: Folio conversions for directory paths [01/17] nilfs2: move page release outside of nilfs_delete_entry and nilfs_set_link [02/17] nilfs2: eliminate staggered calls to kunmap in nilfs_rename [03/17] nilfs2: Remove page_address() from nilfs_set_link [04/17] nilfs2: Remove page_address() from nilfs_add_link [05/17] nilfs2: Remove page_address() from nilfs_delete_entry [06/17] nilfs2: Return the mapped address from nilfs_get_page() [07/17] nilfs2: Pass the mapped address to nilfs_check_page() [08/17] nilfs2: Switch to kmap_local for directory handling [09/17] nilfs2: Add nilfs_get_folio() [10/17] nilfs2: Convert nilfs_readdir to use a folio [11/17] nilfs2: Convert nilfs_find_entry to use a folio [12/17] nilfs2: Convert nilfs_rename() to use folios [13/17] nilfs2: Convert nilfs_add_link() to use a folio [14/17] nilfs2: Convert nilfs_empty_dir() to use a folio [15/17] nilfs2: Convert nilfs_make_empty() to use a folio [16/17] nilfs2: Convert nilfs_prepare_chunk() and nilfs_commit_chunk() to folios [17/17] nilfs2: Convert nilfs_page_bug() to nilfs_folio_bug()

Commit Message

Ryusuke Konishi Nov. 27, 2023, 2:30 p.m. UTC

  From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

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>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
---
 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 9c0513245a3b..73f135290288 100644
--- a/fs/nilfs2/dir.c
+++ b/fs/nilfs2/dir.c
@@ -493,7 +493,7 @@  int nilfs_add_link(struct dentry *dentry, struct inode *inode)
 	return -EINVAL;
 
 got_it:
-	from = (char *)de - (char *)page_address(page);
+	from = offset_in_page(de);
 	to = from + rec_len;
 	err = nilfs_prepare_chunk(page, from, to);
 	if (err)