korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 04:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

nilfs2: remove page_address() from nilfs_delete_entry

Browse Source 
In preparation for removing kmap from directory handling, mask the
directory entry pointer to discover the start address of the page. 
Matches ext2.

Link: https://lkml.kernel.org/r/20231127143036.2425-6-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2023-11-27 23:30:24 +09:00 committed by Andrew Morton
parent 2197f5aed4
commit 6af2191f83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nilfs2/dir.c
View File

@ -531,7 +531,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page)
{ {
struct address_space *mapping = page->mapping; struct address_space *mapping = page->mapping;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
char *kaddr = page_address(page); char *kaddr = (char *)((unsigned long)dir & PAGE_MASK);
unsigned int from, to; unsigned int from, to;
struct nilfs_dir_entry *de, *pde = NULL; struct nilfs_dir_entry *de, *pde = NULL;
int err; int err;
@ -551,7 +551,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page)
de = nilfs_next_entry(de); de = nilfs_next_entry(de);
} }
if (pde) if (pde)
from = (char *)pde - (char *)page_address(page); from = (char *)pde - kaddr;
lock_page(page); lock_page(page);
err = nilfs_prepare_chunk(page, from, to); err = nilfs_prepare_chunk(page, from, to);
BUG_ON(err); BUG_ON(err);