From 7ca6cebc4891fac317bbc4c1beae628bb15aae98 Mon Sep 17 00:00:00 2001
From: Brian Atkinson <batkinson@lanl.gov>
Date: Tue, 10 Dec 2024 17:41:05 -0500
Subject: [PATCH] SQUASH

Ughhhh... Doing some cleanup.

Signed-off-by: Brian Atkinson <batkinson@lanl.gov>
---
 config/kernel-pin-user-pages.m4 |  2 +-
 module/os/linux/zfs/zfs_uio.c   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/kernel-pin-user-pages.m4 b/config/kernel-pin-user-pages.m4
index e56f2aefba38..fe7aff375208 100644
--- a/config/kernel-pin-user-pages.m4
+++ b/config/kernel-pin-user-pages.m4
@@ -7,7 +7,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PIN_USER_PAGES], [
 	],[
 		unsigned long start = 0;
 		unsigned long nr_pages = 1;
-		strauct page **pages = NULL;
+		struct page **pages = NULL;
 		unsigned int gup_flags = 0;
 		long ret __attribute__ ((unused));
 
diff --git a/module/os/linux/zfs/zfs_uio.c b/module/os/linux/zfs/zfs_uio.c
index aa1fa5eb374a..dae473c9f9e0 100644
--- a/module/os/linux/zfs/zfs_uio.c
+++ b/module/os/linux/zfs/zfs_uio.c
@@ -441,6 +441,7 @@ zfs_unmark_page(struct page *page)
 }
 #endif /* HAVE_ZERO_PAGE_GPL_ONLY || !_LP64 */
 
+#if !defined(HAVE_PIN_USER_PAGES_UNLOCKED)
 static void
 zfs_uio_dio_check_for_zero_page(zfs_uio_t *uio)
 {
@@ -472,6 +473,7 @@ zfs_uio_dio_check_for_zero_page(zfs_uio_t *uio)
 		}
 	}
 }
+#endif
 
 void
 zfs_uio_free_dio_pages(zfs_uio_t *uio, zfs_uio_rw_t rw)
@@ -506,8 +508,7 @@ zfs_uio_pin_user_pages(zfs_uio_t *uio, zfs_uio_rw_t rw)
 	long res;
 	size_t skip = uio->uio_skip;
 	size_t len = uio->uio_resid - skip;
-	unsigned ing gup_flags = 0;
-	size_t amt;
+	unsigned int gup_flags = 0;
 	unsigned long addr;
 	unsigned long nr_pages;
 
@@ -530,7 +531,7 @@ zfs_uio_pin_user_pages(zfs_uio_t *uio, zfs_uio_rw_t rw)
 		return (0);
 	}
 #endif
-	const struct iovec *iovp = zfs_uio_uio_iter_iov(uio->iov_iter);
+	const struct iovec *iovp = zfs_uio_iter_iov(uio->uio_iter);
 	for (int i = 0; i < uio->uio_iovcnt; i++) {
 		size_t amt = iovp->iov_len - skip;
 		if (amt == 0) {
@@ -539,7 +540,7 @@ zfs_uio_pin_user_pages(zfs_uio_t *uio, zfs_uio_rw_t rw)
 			continue;
 		}
 
-		addr = ivop->iov_base + skip;
+		addr = (unsigned long)iovp->iov_base + skip;
 		nr_pages = DIV_ROUND_UP(amt, PAGE_SIZE);
 		res = pin_user_pages_unlocked(addr, nr_pages,
 		    &uio->uio_dio.pages[uio->uio_dio.npages], gup_flags);
@@ -631,9 +632,8 @@ zfs_uio_get_dio_pages_alloc(zfs_uio_t *uio, zfs_uio_rw_t rw)
 	}
 
 #if !defined(HAVE_PIN_USER_PAGES_UNLOCKED)
-	if (rw == UIO_WRITE) {
+	if (rw == UIO_WRITE)
 		zfs_uio_dio_check_for_zero_page(uio);
-	}
 #endif
 
 	uio->uio_extflg |= UIO_DIRECT;