Date: Mon, 02 Mar 2026 15:05:09 +0000 From: Martin Matuska <mm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a481cad3fc77 - main - filesystems/openzfs: update to 2.4.1 Message-ID: <69a5a725.27ac9.48e0e449@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a481cad3fc770c597a59397212887ace5aa3a9a1 commit a481cad3fc770c597a59397212887ace5aa3a9a1 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2026-03-02 15:04:03 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2026-03-02 15:04:53 +0000 filesystems/openzfs: update to 2.4.1 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.1 --- filesystems/openzfs/Makefile | 3 +-- filesystems/openzfs/distinfo | 6 ++--- .../openzfs/files/patch-module_nvpair_nvpair.c | 30 ---------------------- filesystems/openzfs/files/patch-module_zfs_vdev.c | 11 -------- .../files/patch-tests_zfs-tests_cmd_mmap__seek.c | 11 -------- filesystems/openzfs/pkg-plist | 7 +++++ 6 files changed, 11 insertions(+), 57 deletions(-) diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile index f0ff998915bd..ea42a2fe1735 100644 --- a/filesystems/openzfs/Makefile +++ b/filesystems/openzfs/Makefile @@ -1,6 +1,5 @@ PORTNAME= openzfs -PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTVERSION= 2.4.1 PORTEPOCH= 1 CATEGORIES= filesystems sysutils MASTER_SITES= https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/ diff --git a/filesystems/openzfs/distinfo b/filesystems/openzfs/distinfo index e44c6bfd0000..76043afa9b5c 100644 --- a/filesystems/openzfs/distinfo +++ b/filesystems/openzfs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1767003926 -SHA256 (zfs-2.4.0.tar.gz) = 7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee -SIZE (zfs-2.4.0.tar.gz) = 34476567 +TIMESTAMP = 1772463483 +SHA256 (zfs-2.4.1.tar.gz) = c17b69770f0023154f578eb8c7536a70f07d6a3bb0bd38f04fa0e8811c3c1390 +SIZE (zfs-2.4.1.tar.gz) = 34498270 diff --git a/filesystems/openzfs/files/patch-module_nvpair_nvpair.c b/filesystems/openzfs/files/patch-module_nvpair_nvpair.c deleted file mode 100644 index aa86845fe14a..000000000000 --- a/filesystems/openzfs/files/patch-module_nvpair_nvpair.c +++ /dev/null @@ -1,30 +0,0 @@ ---- module/nvpair/nvpair.c.orig 2025-12-18 18:01:01 UTC -+++ module/nvpair/nvpair.c -@@ -3246,7 +3246,8 @@ nvs_xdr_nvl_fini(nvstream_t *nvs) - * xdrproc_t-compatible callbacks for xdr_array() - */ - --#if defined(_KERNEL) && defined(__linux__) /* Linux kernel */ -+#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1600010) || \ -+ defined(_KERNEL) && defined(__linux__) /* Linux kernel */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ -@@ -3255,7 +3256,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, void *ptr) \ - return (xdr_##type(xdrs, ptr)); \ - } - --#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc */ -+#elif !defined(_KERNEL) && defined(XDR_CONTROL) /* tirpc, FreeBSD < 16 */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ -@@ -3271,7 +3272,7 @@ nvs_xdr_nvp_##type(XDR *xdrs, ...) \ - return (xdr_##type(xdrs, ptr)); \ - } - --#else /* FreeBSD, sunrpc */ -+#else /* FreeBSD kernel < 16, sunrpc */ - - #define NVS_BUILD_XDRPROC_T(type) \ - static bool_t \ diff --git a/filesystems/openzfs/files/patch-module_zfs_vdev.c b/filesystems/openzfs/files/patch-module_zfs_vdev.c deleted file mode 100644 index eeadafa57d2d..000000000000 --- a/filesystems/openzfs/files/patch-module_zfs_vdev.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index cbb98fffb027..000000000000 --- a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_mmap__seek.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) diff --git a/filesystems/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist index 5d6bc4109b95..adcd9ff05825 100644 --- a/filesystems/openzfs/pkg-plist +++ b/filesystems/openzfs/pkg-plist @@ -713,6 +713,7 @@ share/zfs/compatibility.d/zol-0.8 %%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/bclone/setup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning.kshlib +%%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_after_device_removal.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_clone_mmap_cached.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_clone_mmap_write.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/block_cloning/block_cloning_copyfilerange.ksh @@ -968,6 +969,7 @@ share/zfs/compatibility.d/zol-0.8 %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_010_pos.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_deeply_nested.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_encrypted.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_nomount.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_clone/zfs_clone_rm_nested.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_copies/cleanup.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zfs_copies/setup.ksh @@ -2221,6 +2223,7 @@ share/zfs/compatibility.d/zol-0.8 %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp.cfg %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp.kshlib %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_active_import.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_concurrent_import.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_exported_import.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_hostid.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/mmp/mmp_inactive_import.ksh @@ -2596,6 +2599,10 @@ share/zfs/compatibility.d/zol-0.8 %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_holds.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_hole_birth.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_invalid.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_large_blocks_incremental.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_large_blocks_initial.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_large_microzap_incremental.ksh +%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_large_microzap_transitive.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_mixed_raw.ksh %%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_partial_dataset.kshhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a5a725.27ac9.48e0e449>