git: 1146d9d4a4dc - main - filesystems/openzfs: fix build on i386
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 02 Jan 2026 12:48:45 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1146d9d4a4dc1f050c70482a641c90a1a807f762
commit 1146d9d4a4dc1f050c70482a641c90a1a807f762
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-01-02 12:46:15 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-01-02 12:47:37 +0000
filesystems/openzfs: fix build on i386
Upstream pull request: https://github.com/openzfs/zfs/pull/18096
---
filesystems/openzfs/files/patch-module_zfs_vdev.c | 11 +++++++++++
.../openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/filesystems/openzfs/files/patch-module_zfs_vdev.c b/filesystems/openzfs/files/patch-module_zfs_vdev.c
new file mode 100644
index 000000000000..eeadafa57d2d
--- /dev/null
+++ b/filesystems/openzfs/files/patch-module_zfs_vdev.c
@@ -0,0 +1,11 @@
+--- module/zfs/vdev.c.orig 2025-12-18 18:01:01 UTC
++++ module/zfs/vdev.c
+@@ -4674,7 +4674,7 @@ vdev_clear(spa_t *spa, vdev_t *vd)
+ vd->vdev_stat.vs_checksum_errors = 0;
+ vd->vdev_stat.vs_dio_verify_errors = 0;
+ vd->vdev_stat.vs_slow_ios = 0;
+- atomic_store_64(&vd->vdev_outlier_count, 0);
++ atomic_store_64((volatile uint64_t *)&vd->vdev_outlier_count, 0);
+ vd->vdev_read_sit_out_expire = 0;
+
+ for (int c = 0; c < vd->vdev_children; c++)
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c
new file mode 100644
index 000000000000..cbb98fffb027
--- /dev/null
+++ b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c
@@ -0,0 +1,11 @@
+--- tests/zfs-tests/cmd/mmap_seek.c.orig 2025-12-30 21:33:04 UTC
++++ tests/zfs-tests/cmd/mmap_seek.c
+@@ -55,7 +55,7 @@ seek_expect(int fd, off_t offset, int whence, off_t ex
+ return;
+
+ int err = errno;
+- fprintf(stderr, "lseek(fd, %ld, SEEK_%s) = %ld (expected %ld)",
++ fprintf(stderr, "lseek(fd, %jd, SEEK_%s) = %jd (expected %jd)",
+ offset, (whence == SEEK_DATA ? "DATA" : "HOLE"),
+ seek_offset, expect_offset);
+ if (err != 0)