Skip to content

Commit 8cf57c6

Browse files
konisakpm00
authored andcommitted
nilfs2: eliminate staggered calls to kunmap in nilfs_rename
In nilfs_rename(), calls to nilfs_put_page() to release pages obtained with nilfs_find_entry() or nilfs_dotdot() are alternated in the normal path. When replacing the kernel memory mapping method from kmap to kmap_local_{page,folio}, this violates the constraint on the calling order of kunmap_local(). Swap the order of nilfs_put_page calls where the kmap sections of multiple pages overlap so that they are nested, allowing direct replacement of nilfs_put_page() -> unmap_and_put_page(). Without this reordering, that replacement will cause a kernel WARNING in kunmap_local_indexed() on architectures with high memory mapping. Link: https://lkml.kernel.org/r/20231127143036.2425-3-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 584db20 commit 8cf57c6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/nilfs2/namei.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,14 @@ static int nilfs_rename(struct mnt_idmap *idmap,
411411
inode_set_ctime_current(old_inode);
412412

413413
nilfs_delete_entry(old_de, old_page);
414-
nilfs_put_page(old_page);
415414

416415
if (dir_de) {
417416
nilfs_set_link(old_inode, dir_de, dir_page, new_dir);
418417
nilfs_put_page(dir_page);
419418
drop_nlink(old_dir);
420419
}
420+
nilfs_put_page(old_page);
421+
421422
nilfs_mark_inode_dirty(old_dir);
422423
nilfs_mark_inode_dirty(old_inode);
423424

0 commit comments

Comments
 (0)