diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2023-11-27 23:30:24 +0900 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-10 17:21:45 -0800 |
| commit | 6af2191f8358fa89061df70bf68a1fd616e49a06 (patch) | |
| tree | 940f79e26da126414ecf35f47ea24996a6763eb5 /fs/nilfs2 | |
| parent | 2197f5aed404216ec8035bcf726ad808418fd691 (diff) | |
| download | linux-6af2191f8358fa89061df70bf68a1fd616e49a06.tar.gz linux-6af2191f8358fa89061df70bf68a1fd616e49a06.tar.bz2 linux-6af2191f8358fa89061df70bf68a1fd616e49a06.zip | |
nilfs2: remove page_address() from nilfs_delete_entry
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>
Diffstat (limited to 'fs/nilfs2')
| -rw-r--r-- | fs/nilfs2/dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 73f135290288..385e47eda99f 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -531,7 +531,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) { struct address_space *mapping = page->mapping; struct inode *inode = mapping->host; - char *kaddr = page_address(page); + char *kaddr = (char *)((unsigned long)dir & PAGE_MASK); unsigned int from, to; struct nilfs_dir_entry *de, *pde = NULL; int err; @@ -551,7 +551,7 @@ int nilfs_delete_entry(struct nilfs_dir_entry *dir, struct page *page) de = nilfs_next_entry(de); } if (pde) - from = (char *)pde - (char *)page_address(page); + from = (char *)pde - kaddr; lock_page(page); err = nilfs_prepare_chunk(page, from, to); BUG_ON(err); |