SQUASH

Signed-off-by: Brian Atkinson <[email protected]>
bwatkinson · Jan 29, 2025 · 613bc1a · 613bc1a
1 parent d593704
commit 613bc1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/module/os/linux/zfs/zfs_uio.c b/module/os/linux/zfs/zfs_uio.c
@@ -480,12 +480,9 @@ zfs_uio_free_dio_pages(zfs_uio_t *uio, zfs_uio_rw_t rw)
 	ASSERT3P(uio->uio_dio.pages, !=, NULL);
 
 #if defined(HAVE_PIN_USER_PAGES_UNLOCKED)
-	if (uio->uio_dio.pinned) {
+	if (uio->uio_dio.pinned)
 		unpin_user_pages(uio->uio_dio.pages, uio->uio_dio.npages);
-		vmem_free(uio->uio_dio.pages,
-		    uio->uio_dio.npages * sizeof (struct page *));
-		return;
-	}
+	else
 #endif
 	for (long i = 0; i < uio->uio_dio.npages; i++) {
 		struct page *p = uio->uio_dio.pages[i];
@@ -649,13 +646,16 @@ zfs_uio_get_dio_pages_alloc(zfs_uio_t *uio, zfs_uio_rw_t rw)
 
 	if (error) {
 #if defined(HAVE_PIN_USER_PAGES_UNLOCKED)
-		if (uio->uio_dio.pinned)
+		if (uio->uio_dio.pinned) {
 			unpin_user_pages(uio->uio_dio.pages,
 			    uio->uio_dio.npages);
-		else
+		} else {
+#endif
+			for (long i = 0; i < uio->uio_dio.npages; i++)
+				put_page(uio->uio_dio.pages[i]);
+#if defined(HAVE_PIN_USER_PAGES_UNLOCKED)
+		}
 #endif
-		for (long i = 0; i < uio->uio_dio.npages; i++)
-			put_page(uio->uio_dio.pages[i]);
 
 		vmem_free(uio->uio_dio.pages, size);
 		return (error);

diff --git a/tests/zfs-tests/tests/functional/direct/dio_loopback_dev.ksh b/tests/zfs-tests/tests/functional/direct/dio_loopback_dev.ksh
@@ -51,7 +51,7 @@ function cleanup
 
 log_assert "Verify loopback devices with Direct I/O."
 
-if is_freebsd; then
+if ! is_linux; then
 	log_unsupported "This is just a check for Linux Direct I/O"
 fi