Commit a8e61035 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

nilfs2: pass the mapped address to nilfs_check_page() 

Remove another use of page_address() as part of preparing for the kmap to
kmap_local transition.

Link: https://lkml.kernel.org/r/20231127143036.2425-8-konishi.ryusuke@gmail.com


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 09a46acb

fs/nilfs2/dir.c

+2 −3
Original line number Diff line number Diff line
@@ -107,12 +107,11 @@ static void nilfs_commit_chunk(struct page *page, 
	unlock_page(page);

}



static bool nilfs_check_page(struct page *page)

static bool nilfs_check_page(struct page *page, char *kaddr)

{

	struct inode *dir = page->mapping->host;

	struct super_block *sb = dir->i_sb;

	unsigned int chunk_size = nilfs_chunk_size(dir);

	char *kaddr = page_address(page);

	unsigned int offs, rec_len;

	unsigned int limit = PAGE_SIZE;

	struct nilfs_dir_entry *p;
@@ -192,7 +191,7 @@ static void *nilfs_get_page(struct inode *dir, unsigned long n, 


	kaddr = kmap(page);

	if (unlikely(!PageChecked(page))) {

		if (!nilfs_check_page(page))

		if (!nilfs_check_page(page, kaddr))

			goto fail;

	}