On Thu, Jul 6, 2023, at 10:20, Arnd Bergmann wrote:
> - A cleanup for virt_to_pfn/virt_to_bus to have proper type
> checking, forcing the use of pointers
Sorry, I meant to mention a conflict against f5f82cd18732
("Move netfs_extract_iter_to_sg() to lib/scatterlist.c"), which
Stephen fixed up in linux-next as below.
Arnd
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 9 Jun 2023 10:35:56 +1000
Subject: [PATCH] fix up for "Move netfs_extract_iter_to_sg() to lib/scatterlist.c"
interacting with "netfs: Pass a pointer to virt_to_page()"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
lib/scatterlist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index e97d7060329e..e86231a44c3d 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -1237,7 +1237,7 @@ static ssize_t extract_kvec_to_sg(struct iov_iter *iter,
if (is_vmalloc_or_module_addr((void *)kaddr))
page = vmalloc_to_page((void *)kaddr);
else
- page = virt_to_page(kaddr);
+ page = virt_to_page((void *)kaddr);
sg_set_page(sg, page, len, off);
sgtable->nents++;
