The quilt patch titled
Subject: nilfs2: convert recovery logic to use kmap_local
has been removed from the -mm tree. Its filename was
nilfs2-convert-recovery-logic-to-use-kmap_local.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
Subject: nilfs2: convert recovery logic to use kmap_local
Date: Mon, 22 Jan 2024 23:01:48 +0900
Patch series "nilfs2: eliminate kmap and kmap_atomic calls".
This series converts remaining kmap and kmap_atomic calls to use
kmap_local, mainly in metadata files, and eliminates calls to these
deprecated kmap functions from nilfs2.
This series does not include converting metadata files to use folios, but
it is a step in that direction.
Most conversions are straightforward, but some are not: the checkpoint
file, the inode file, and the persistent object allocator. These have
been adjusted or rewritten to avoid multiple kmap_local calls or nest them
if necessary, and to eliminate long waits like block I/O within the
highmem mapping sections.
This series has been tested in both 32-bit and 64-bit environments with
varying block sizes.
This patch (of 15):
In the recovery function when mounting, nilfs_recovery_copy_block() uses
the deprecated kmap_atomic(), so convert it to use kmap_local.
Link: https://lkml.kernel.org/r/20240122140202.6950-1-konishi.ryusuke@xxxxxxxxx
Link: https://lkml.kernel.org/r/20240122140202.6950-2-konishi.ryusuke@xxxxxxxxx
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nilfs2/recovery.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/nilfs2/recovery.c~nilfs2-convert-recovery-logic-to-use-kmap_local
+++ a/fs/nilfs2/recovery.c
@@ -482,9 +482,9 @@ static int nilfs_recovery_copy_block(str
if (unlikely(!bh_org))
return -EIO;
- kaddr = kmap_atomic(page);
+ kaddr = kmap_local_page(page);
memcpy(kaddr + from, bh_org->b_data, bh_org->b_size);
- kunmap_atomic(kaddr);
+ kunmap_local(kaddr);
brelse(bh_org);
return 0;
}
_
Patches currently in -mm which might be from konishi.ryusuke@xxxxxxxxx are
