summaryrefslogtreecommitdiff
path: root/filesystems/openzfs
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/openzfs')
-rw-r--r--filesystems/openzfs/Makefile3
-rw-r--r--filesystems/openzfs/distinfo6
-rw-r--r--filesystems/openzfs/files/patch-cmd_zinject_zinject.c32
-rw-r--r--filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c39
-rw-r--r--filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c11
-rw-r--r--filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c29
-rw-r--r--filesystems/openzfs/pkg-plist152
7 files changed, 99 insertions, 173 deletions
diff --git a/filesystems/openzfs/Makefile b/filesystems/openzfs/Makefile
index 455a9cdd076b..f077e999bafa 100644
--- a/filesystems/openzfs/Makefile
+++ b/filesystems/openzfs/Makefile
@@ -1,6 +1,5 @@
PORTNAME= openzfs
-PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTVERSION= 2.3.3
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 98479a288312..70a65f9d32fa 100644
--- a/filesystems/openzfs/distinfo
+++ b/filesystems/openzfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743065095
-SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-SIZE (zfs-2.3.1.tar.gz) = 34048716
+TIMESTAMP = 1750544790
+SHA256 (zfs-2.3.3.tar.gz) = 844122118f0ea81205a01753bbcb1315330f8967c1f866dcd10155273131f071
+SIZE (zfs-2.3.3.tar.gz) = 34360540
diff --git a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c b/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
deleted file mode 100644
index a817c794e5b7..000000000000
--- a/filesystems/openzfs/files/patch-cmd_zinject_zinject.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- cmd/zinject/zinject.c.orig 2025-03-29 23:43:40 UTC
-+++ cmd/zinject/zinject.c
-@@ -453,7 +453,8 @@ print_data_handler(int id, const char *pool, zinject_r
-
-
- (void) printf("%3d %-15s %-6llu %-6llu %-8s %-3d 0x%02x %-15s "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_objset,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_objset,
- (u_longlong_t)record->zi_object, type_to_name(record->zi_type),
- record->zi_level, record->zi_dvas, rangebuf,
- record->zi_match_count, record->zi_inject_count);
-@@ -490,7 +491,8 @@ print_device_handler(int id, const char *pool, zinject
- (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
-
- (void) printf("%3d %-15s %llx %-5s %-10s %8.4f%% "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_guid,
- iotype_to_str(record->zi_iotype), err_to_str(record->zi_error),
- freq, record->zi_match_count, record->zi_inject_count);
-
-@@ -525,7 +527,8 @@ print_delay_handler(int id, const char *pool, zinject_
- (((double)record->zi_freq) / ZI_PERCENTAGE_MAX) * 100.0f;
-
- (void) printf("%3d %-15s %llx %10llu %5llu %8.4f%% "
-- "%6lu %6lu\n", id, pool, (u_longlong_t)record->zi_guid,
-+ "%6" PRIu64 " %6" PRIu64 "\n", id, pool,
-+ (u_longlong_t)record->zi_guid,
- (u_longlong_t)NSEC2MSEC(record->zi_timer),
- (u_longlong_t)record->zi_nlanes,
- freq, record->zi_match_count, record->zi_inject_count);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
deleted file mode 100644
index 5448993d1e7f..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_clonefile.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- tests/zfs-tests/cmd/clonefile.c.orig 2025-03-10 22:42:59 UTC
-+++ tests/zfs-tests/cmd/clonefile.c
-@@ -205,6 +205,7 @@ main(int argc, char **argv)
-
- loff_t soff = 0, doff = 0;
- size_t len = SSIZE_MAX;
-+ unsigned long long len2;
- if ((argc-optind) == 5) {
- soff = strtoull(argv[optind+2], NULL, 10);
- if (soff == ULLONG_MAX) {
-@@ -220,8 +221,8 @@ main(int argc, char **argv)
- strcmp(argv[optind+4], "all") == 0) {
- len = SSIZE_MAX;
- } else {
-- len = strtoull(argv[optind+4], NULL, 10);
-- if (len == ULLONG_MAX) {
-+ len2 = strtoull(argv[optind+4], NULL, 10);
-+ if (len2 == ULLONG_MAX) {
- fprintf(stderr, "invalid length");
- return (1);
- }
-@@ -268,7 +269,7 @@ main(int argc, char **argv)
- off_t dpos = lseek(dfd, 0, SEEK_CUR);
- off_t dlen = lseek(dfd, 0, SEEK_END);
-
-- fprintf(stderr, "file offsets: src=%lu/%lu; dst=%lu/%lu\n",
-+ fprintf(stderr, "file offsets: src=%jd/%jd; dst=%jd/%jd\n",
- spos, slen, dpos, dlen);
- }
-
-@@ -331,7 +332,7 @@ do_copyfilerange(int sfd, int dfd, loff_t soff, loff_t
- }
- if (copied != len) {
- fprintf(stderr, "copy_file_range: copied less than requested: "
-- "requested=%lu; copied=%lu\n", len, copied);
-+ "requested=%zu; copied=%zd\n", len, copied);
- return (1);
- }
- return (0);
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c
new file mode 100644
index 000000000000..408802f20a63
--- /dev/null
+++ b/filesystems/openzfs/files/patch-tests_zfs-tests_cmd_crypto__test.c
@@ -0,0 +1,11 @@
+--- tests/zfs-tests/cmd/crypto_test.c.orig 2025-05-06 18:18:44 UTC
++++ tests/zfs-tests/cmd/crypto_test.c
+@@ -861,7 +861,7 @@ test_result(const crypto_test_t *test, int encrypt_rv,
+ return (pass);
+
+ /* print summary of test result */
+- printf("%s[%lu]: encrypt=%s decrypt=%s\n", test->fileloc, test->id,
++ printf("%s[%" PRIu64 "]: encrypt=%s decrypt=%s\n", test->fileloc, test->id,
+ encrypt_pass ? "PASS" : "FAIL",
+ decrypt_pass ? "PASS" : "FAIL");
+
diff --git a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c b/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
deleted file mode 100644
index 3a78abbb89d2..000000000000
--- a/filesystems/openzfs/files/patch-tests_zfs-tests_tests_functional_vdev__disk_page__alignment.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c.orig 2025-03-30 00:02:54 UTC
-+++ tests/zfs-tests/tests/functional/vdev_disk/page_alignment.c
-@@ -420,14 +420,14 @@ run_test(const page_test_t *test, bool verbose)
- size_t take = MIN(rem, len);
-
- if (verbose)
-- printf(" page %d [off %lx len %lx], "
-- "rem %lx, take %lx\n",
-+ printf(" page %d [off %zx len %zx], "
-+ "rem %zx, take %zx\n",
- i, off, len, rem, take);
-
- if (vdev_disk_check_alignment_cb(NULL, off, take, &s)) {
- if (verbose)
- printf(" ABORT: misalignment detected, "
-- "rem %lx\n", rem);
-+ "rem %zx\n", rem);
- return (false);
- }
-
-@@ -438,7 +438,7 @@ run_test(const page_test_t *test, bool verbose)
-
- if (rem > 0) {
- if (verbose)
-- printf(" ABORT: ran out of pages, rem %lx\n", rem);
-+ printf(" ABORT: ran out of pages, rem %zx\n", rem);
- return (false);
- }
-
diff --git a/filesystems/openzfs/pkg-plist b/filesystems/openzfs/pkg-plist
index c61f6ba63967..caa9f4e9804f 100644
--- a/filesystems/openzfs/pkg-plist
+++ b/filesystems/openzfs/pkg-plist
@@ -63,6 +63,8 @@ include/libspl/rpc/xdr.h
include/libspl/statcommon.h
include/libspl/stdlib.h
include/libspl/string.h
+include/libspl/sys/abd_impl_os.h
+include/libspl/sys/abd_os.h
include/libspl/sys/acl.h
include/libspl/sys/acl_impl.h
include/libspl/sys/asm_linkage.h
@@ -284,8 +286,6 @@ include/libzfs/zfs_fletcher.h
include/libzfs/zfs_namecheck.h
include/libzfs/zfs_prop.h
include/libzfs/zfs_valstr.h
-include/libzpool/abd_impl_os.h
-include/libzpool/abd_os.h
lib/libnvpair.a
lib/libnvpair.so
lib/libnvpair.so.3
@@ -311,29 +311,29 @@ lib/libzpool.so
lib/libzpool.so.6
lib/libzpool.so.6.0.0
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_error_translation%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_libzfs_core%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_nvlist%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/ctypes%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/exceptions%%PYTHON_TAG%%.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_constants.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_error_translation.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_libzfs_core.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/_nvlist.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libnvpair%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/__pycache__/libzfs_core%%PYTHON_TAG%%.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libnvpair.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/bindings/libzfs_core.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/ctypes.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/exceptions.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core%%PYTHON_EXT_SUFFIX%%.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_libzfs_core%%PYTHON_TAG%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/__pycache__/test_nvlist%%PYTHON_TAG%%.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_libzfs_core.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/test/test_nvlist.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyzfs-2.2.2-py%%PYTHON_VER%%.egg-info/PKG-INFO
@@ -502,59 +502,58 @@ share/man/man8/zstream.8.gz
share/man/man8/zstreamdump.8.gz
share/pam-configs/zfs_key
%%TESTS%%share/zfs/common.sh
-%%TESTS%%share/zfs/compatibility.d/2018
-%%TESTS%%share/zfs/compatibility.d/2019
-%%TESTS%%share/zfs/compatibility.d/2020
-%%TESTS%%share/zfs/compatibility.d/2021
-%%TESTS%%share/zfs/compatibility.d/compat-2018
-%%TESTS%%share/zfs/compatibility.d/compat-2019
-%%TESTS%%share/zfs/compatibility.d/compat-2020
-%%TESTS%%share/zfs/compatibility.d/compat-2021
-%%TESTS%%share/zfs/compatibility.d/freebsd-11.0
-%%TESTS%%share/zfs/compatibility.d/freebsd-11.1
-%%TESTS%%share/zfs/compatibility.d/freebsd-11.2
-%%TESTS%%share/zfs/compatibility.d/freebsd-11.3
-%%TESTS%%share/zfs/compatibility.d/freebsd-11.4
-%%TESTS%%share/zfs/compatibility.d/freebsd-12.0
-%%TESTS%%share/zfs/compatibility.d/freebsd-12.1
-%%TESTS%%share/zfs/compatibility.d/freebsd-12.2
-%%TESTS%%share/zfs/compatibility.d/freebsd-12.3
-%%TESTS%%share/zfs/compatibility.d/freebsd-12.4
-%%TESTS%%share/zfs/compatibility.d/freebsd-13.0
-%%TESTS%%share/zfs/compatibility.d/freebsd-13.1
-%%TESTS%%share/zfs/compatibility.d/freebsd-13.2
-%%TESTS%%share/zfs/compatibility.d/freenas-11.0
-%%TESTS%%share/zfs/compatibility.d/freenas-11.1
-%%TESTS%%share/zfs/compatibility.d/freenas-11.2
-%%TESTS%%share/zfs/compatibility.d/freenas-11.3
-%%TESTS%%share/zfs/compatibility.d/freenas-9.10.2
-%%TESTS%%share/zfs/compatibility.d/grub2
-%%TESTS%%share/zfs/compatibility.d/grub2-2.06
-%%TESTS%%share/zfs/compatibility.d/grub2-2.12
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.0-freebsd
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.0-linux
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.1-freebsd
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.1-linux
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.2
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.2-freebsd
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.2-linux
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.3
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.3-freebsd
-%%TESTS%%share/zfs/compatibility.d/openzfs-2.3-linux
-%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.7.0
-%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.7.0
-%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.8.1
-%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.9.3
-%%TESTS%%share/zfs/compatibility.d/openzfsonosx-1.9.4
-%%TESTS%%share/zfs/compatibility.d/truenas-12.0
-%%TESTS%%share/zfs/compatibility.d/ubuntu-18.04
-%%TESTS%%share/zfs/compatibility.d/ubuntu-20.04
-%%TESTS%%share/zfs/compatibility.d/ubuntu-22.04
-%%TESTS%%share/zfs/compatibility.d/zol-0.6.1
-%%TESTS%%share/zfs/compatibility.d/zol-0.6.4
-%%TESTS%%share/zfs/compatibility.d/zol-0.6.5
-%%TESTS%%share/zfs/compatibility.d/zol-0.7
-%%TESTS%%share/zfs/compatibility.d/zol-0.8
+share/zfs/compatibility.d/2018
+share/zfs/compatibility.d/2019
+share/zfs/compatibility.d/2020
+share/zfs/compatibility.d/2021
+share/zfs/compatibility.d/compat-2018
+share/zfs/compatibility.d/compat-2019
+share/zfs/compatibility.d/compat-2020
+share/zfs/compatibility.d/compat-2021
+share/zfs/compatibility.d/freebsd-11.0
+share/zfs/compatibility.d/freebsd-11.1
+share/zfs/compatibility.d/freebsd-11.2
+share/zfs/compatibility.d/freebsd-11.3
+share/zfs/compatibility.d/freebsd-11.4
+share/zfs/compatibility.d/freebsd-12.0
+share/zfs/compatibility.d/freebsd-12.1
+share/zfs/compatibility.d/freebsd-12.2
+share/zfs/compatibility.d/freebsd-12.3
+share/zfs/compatibility.d/freebsd-12.4
+share/zfs/compatibility.d/freebsd-13.0
+share/zfs/compatibility.d/freebsd-13.1
+share/zfs/compatibility.d/freebsd-13.2
+share/zfs/compatibility.d/freenas-11.0
+share/zfs/compatibility.d/freenas-11.1
+share/zfs/compatibility.d/freenas-11.2
+share/zfs/compatibility.d/freenas-11.3
+share/zfs/compatibility.d/freenas-9.10.2
+share/zfs/compatibility.d/grub2
+share/zfs/compatibility.d/grub2-2.06
+share/zfs/compatibility.d/grub2-2.12
+share/zfs/compatibility.d/openzfs-2.0-freebsd
+share/zfs/compatibility.d/openzfs-2.0-linux
+share/zfs/compatibility.d/openzfs-2.1-freebsd
+share/zfs/compatibility.d/openzfs-2.1-linux
+share/zfs/compatibility.d/openzfs-2.2
+share/zfs/compatibility.d/openzfs-2.2-freebsd
+share/zfs/compatibility.d/openzfs-2.2-linux
+share/zfs/compatibility.d/openzfs-2.3
+share/zfs/compatibility.d/openzfs-2.3-freebsd
+share/zfs/compatibility.d/openzfs-2.3-linux
+share/zfs/compatibility.d/openzfsonosx-1.7.0
+share/zfs/compatibility.d/openzfsonosx-1.8.1
+share/zfs/compatibility.d/openzfsonosx-1.9.3
+share/zfs/compatibility.d/openzfsonosx-1.9.4
+share/zfs/compatibility.d/truenas-12.0
+share/zfs/compatibility.d/ubuntu-18.04
+share/zfs/compatibility.d/ubuntu-20.04
+share/zfs/compatibility.d/ubuntu-22.04
+share/zfs/compatibility.d/zol-0.6.1
+share/zfs/compatibility.d/zol-0.6.4
+share/zfs/compatibility.d/zol-0.6.5
+share/zfs/compatibility.d/zol-0.7
+share/zfs/compatibility.d/zol-0.8
%%TESTS%%share/zfs/runfiles/bclone.run
%%TESTS%%share/zfs/runfiles/common.run
%%TESTS%%share/zfs/runfiles/freebsd.run
@@ -576,6 +575,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/bin/clone_mmap_write
%%TESTS%%share/zfs/zfs-tests/bin/clonefile
%%TESTS%%share/zfs/zfs-tests/bin/cp_files
+%%TESTS%%share/zfs/zfs-tests/bin/crypto_test
%%TESTS%%share/zfs/zfs-tests/bin/ctime
%%TESTS%%share/zfs/zfs-tests/bin/dir_rd_update
%%TESTS%%share/zfs/zfs-tests/bin/dosmode_readonly_write
@@ -790,6 +790,8 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.divide_by_zero.err
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.divide_by_zero.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.divide_by_zero.zcp
+%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.exists.zcp
%%TESTS%%share/zfs/zfs-tests/tests/functional/channel_program/lua_core/tst.integer_illegal.ksh
@@ -1434,6 +1436,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/vdev_get.cfg
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/vdev_get_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/vdev_get_all.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_001_pos.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_002_pos.ksh
@@ -1591,6 +1594,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_002_neg.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_003_neg.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_clear_userprop.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_common.kshlib
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_set/zpool_set_features.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cli_root/zpool_split/cleanup.ksh
@@ -1831,6 +1835,12 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/cp_stress.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/seekflood
%%TESTS%%share/zfs/zfs-tests/tests/functional/cp_files/setup.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_ccm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.json
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/aes_gcm_test.txt
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_ccm.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/crypto/icp_aes_gcm.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/crtime_001_pos.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/crtime/setup.ksh
@@ -1848,7 +1858,9 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_mixed.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_fdt_upgrade.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_legacy_import.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_prune.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_quota.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/dedup_zap_shrink.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/dedup/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/delegate/delegate.cfg
@@ -1943,6 +1955,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_001_pos.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_002_pos.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_ashift.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_double.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_multiple.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/auto_spare_shared.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/fault/cleanup.ksh
@@ -2505,6 +2518,7 @@ share/pam-configs/zfs_key
%%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_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.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/rsend/send_raw_ashift.ksh
@@ -2586,6 +2600,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/stat_001_pos.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/stat/statx_dioalign.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/cleanup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/setup.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_none.ksh
@@ -2593,6 +2608,7 @@ share/pam-configs/zfs_key
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_suid.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_to_suid_sgid.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/suid/suid_write_zil_replay.ksh
+%%TESTS%%share/zfs/zfs-tests/tests/functional/syncfs/syncfs_suspend.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/trim/autotrim_config.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/trim/autotrim_integrity.ksh
%%TESTS%%share/zfs/zfs-tests/tests/functional/trim/autotrim_trim_integrity.ksh