From: Matthew Wilcox (Oracle) Date: Mon, 27 Nov 2023 14:30:22 +0000 (+0900) Subject: nilfs2: remove page_address() from nilfs_set_link X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6bb09fa1b44f8634e7091d6186bcba80edebfce7;p=linux.git nilfs2: remove page_address() from nilfs_set_link In preparation for removing kmap from directory handling, use offset_in_page() to calculate 'from'. Matches ext2. Link: https://lkml.kernel.org/r/20231127143036.2425-4-konishi.ryusuke@gmail.com Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Ryusuke Konishi Signed-off-by: Andrew Morton --- diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index b9f13bdf8fbaa..9c0513245a3b4 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -410,7 +410,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;