diff mbox series

minixfs: Fix minixfs_rename with HIGHMEM

Message ID 20240709195841.1986374-1-willy@infradead.org (mailing list archive)
State New
Headers show
Series minixfs: Fix minixfs_rename with HIGHMEM | expand

Commit Message

Matthew Wilcox (Oracle) July 9, 2024, 7:58 p.m. UTC
minixfs now uses kmap_local_page(), so we can't call kunmap() to
undo it.  This one call was missed as part of the commit this fixes.

Fixes: 6628f69ee66a (minixfs: Use dir_put_page() in minix_unlink() and minix_rename())
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/minix/namei.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Christian Brauner July 10, 2024, 5:17 a.m. UTC | #1
On Tue, 09 Jul 2024 20:58:39 +0100, Matthew Wilcox (Oracle) wrote:
> minixfs now uses kmap_local_page(), so we can't call kunmap() to
> undo it.  This one call was missed as part of the commit this fixes.
> 
> 

Applied to the vfs.fixes branch of the vfs/vfs.git tree.
Patches in the vfs.fixes branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.fixes

[1/1] minixfs: Fix minixfs_rename with HIGHMEM
      https://git.kernel.org/vfs/vfs/c/3d1bec293378
diff mbox series

Patch

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index d6031acc34f0..a944a0f17b53 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -213,8 +213,7 @@  static int minix_rename(struct mnt_idmap *idmap,
 		if (!new_de)
 			goto out_dir;
 		err = minix_set_link(new_de, new_page, old_inode);
-		kunmap(new_page);
-		put_page(new_page);
+		unmap_and_put_page(new_page, new_de);
 		if (err)
 			goto out_dir;
 		inode_set_ctime_current(new_inode);