git: 34f9f5680c9d - main - zfs: merge openzfs/zfs@1f380a4f3
Date: Tue, 29 Sep 2026 07:27:00 UTC
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=34f9f5680c9d5d5138e427ba3aeab0138cec3882
commit 34f9f5680c9d5d5138e427ba3aeab0138cec3882
Merge: e1c59c909d63 1f380a4f34da
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-09-29 07:25:04 +0000
Commit: Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-09-29 07:25:39 +0000
zfs: merge openzfs/zfs@1f380a4f3
Notable upstream pull request merges:
#17864 e903655c5 zpool: Add zpool status -vv error ranges
#18820 -multiple zdb: account pending DDT-log frees in leak detection
#18884 -multiple zio_crypt: establish platform interface; rework common
code to use it
#19010 -multiple zfs_namecheck: reject '.' and '..' before a snapshot or
bookmark
#19031 994fb1703 Fix metaslab count assertion in metaslab_group_alloc()
for small vdevs
#19093 f5b2fc8e2 zfs_ctldir: make .zfs/snapshot/<name> btime the snapshot
creation time
#19097 2dece2a34 zstream: report invalid record context without assertions
#19102 78f49e1dd vdev_disk: simplify alignment checks for linear ABDs
#19108 -multiple Fix permanent errors misfiled into the scrub error log
#19110 fa4bc4dec spa_errlog: don't let one unresolvable entry hide the
whole error log
#19116 b6dde8a17 zio_crypt: free the key unwrap uios when decryption fails
#19122 -multiple Fix dd_lock contention on space accounting
#19126 c792317f2 Avoid dp_lock in the dirty space accounting
#19131 7fd87803e Make the spa_config_lock reader fast path lockless
#19137 a83d96835 libzfs: do not iterate snapshots for a mountpoint
changelist
#19152 ccce78729 ZIO: Order a batch arrival against the hold it releases
#19155 9d7260c9b Propagate vdev state change on probe failure
#19157 946be3a33 FreeBSD: remove legacy ioctl support
#19165 1d9c32c16 zpool: accept more redundant special and dedup vdevs
#19167 638abd22a zfs_domount: fix vfs_t double-free on root setup failure
Obtained from: OpenZFS
OpenZFS commit: 1f380a4f34da6068d22960807f53cda68a356add
cddl/lib/libzfs_core/Makefile | 3 +-
cddl/lib/libzpool/Makefile | 1 +
cddl/lib/libzutil/Makefile | 3 -
cddl/usr.bin/zstream/Makefile | 2 +-
sys/conf/files | 4 +-
.../.github/workflows/scripts/qemu-2-start.sh | 4 +-
.../.github/workflows/scripts/qemu-3-deps-vm.sh | 11 +-
sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 2 +-
sys/contrib/openzfs/Makefile.am | 6 +-
sys/contrib/openzfs/cmd/zdb/zdb.c | 130 +-
sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c | 8 +
sys/contrib/openzfs/cmd/zinject/translate.c | 79 +-
sys/contrib/openzfs/cmd/zpool/zpool_main.c | 249 ++-
sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 251 ++-
sys/contrib/openzfs/cmd/zstream/Makefile.am | 2 +-
sys/contrib/openzfs/cmd/zstream/zstream.c | 35 +-
sys/contrib/openzfs/cmd/zstream/zstream.h | 12 +-
.../openzfs/cmd/zstream/zstream_decompress.c | 91 +-
...stream_drop_record.c => zstream_drop_records.c} | 70 +-
sys/contrib/openzfs/cmd/zstream/zstream_io.c | 10 +-
.../openzfs/cmd/zstream/zstream_recompress.c | 42 +-
sys/contrib/openzfs/cmd/zstream/zstream_token.c | 18 +-
sys/contrib/openzfs/cmd/zstream/zstream_util.c | 193 ++
sys/contrib/openzfs/cmd/zstream/zstream_util.h | 65 +
sys/contrib/openzfs/cmd/zstream/zstream_validate.c | 38 +-
sys/contrib/openzfs/config/deb.am | 43 +-
.../openzfs/config/kernel-config-defined.m4 | 2 +-
sys/contrib/openzfs/config/kernel-kasan-enabled.m4 | 2 +-
.../openzfs/config/kernel-rq-for-each-bvec.m4 | 29 +
.../openzfs/config/kernel-super-set-uuid.m4 | 30 +
sys/contrib/openzfs/config/kernel-zero_page.m4 | 2 +-
sys/contrib/openzfs/config/kernel.m4 | 38 +-
sys/contrib/openzfs/config/rpm.am | 20 +-
sys/contrib/openzfs/config/user-libtirpc.m4 | 4 +-
sys/contrib/openzfs/config/zfs-build.m4 | 38 +-
sys/contrib/openzfs/config/zfs-meta.m4 | 8 +-
sys/contrib/openzfs/contrib/debian/changelog.in | 2 +-
sys/contrib/openzfs/contrib/debian/rules.in | 2 +-
sys/contrib/openzfs/include/Makefile.am | 1 +
sys/contrib/openzfs/include/os/freebsd/Makefile.am | 1 +
.../openzfs/include/os/freebsd/spl/sys/atomic.h | 68 +
.../openzfs/include/os/freebsd/spl/sys/uio.h | 1 +
.../include/os/freebsd/zfs/sys/zfs_ioctl_compat.h | 128 +-
.../include/os/freebsd/zfs/sys/zio_crypt_os.h | 31 +
sys/contrib/openzfs/include/os/linux/Makefile.am | 1 +
.../include/os/linux/kernel/linux/kmap_compat.h | 17 +
.../openzfs/include/os/linux/spl/sys/atomic.h | 28 +
.../openzfs/include/os/linux/spl/sys/cmn_err.h | 2 +-
.../openzfs/include/os/linux/spl/sys/debug.h | 8 -
.../include/os/linux/spl/sys/ia32/asm_linkage.h | 2 -
.../openzfs/include/os/linux/spl/sys/trace.h | 3 -
.../openzfs/include/os/linux/spl/sys/trace_taskq.h | 2 -
sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 7 +-
.../openzfs/include/os/linux/zfs/sys/policy.h | 3 -
.../openzfs/include/os/linux/zfs/sys/trace_acl.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_arc.h | 2 -
.../include/os/linux/zfs/sys/trace_dbgmsg.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_dmu.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_dnode.h | 2 -
.../include/os/linux/zfs/sys/trace_multilist.h | 2 -
.../include/os/linux/zfs/sys/trace_rrwlock.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_txg.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_vdev.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_zil.h | 2 -
.../openzfs/include/os/linux/zfs/sys/trace_zio.h | 2 -
.../include/os/linux/zfs/sys/trace_zrlock.h | 2 -
.../openzfs/include/os/linux/zfs/sys/zfs_ctldir.h | 1 +
.../include/os/linux/zfs/sys/zfs_znode_impl.h | 4 -
.../include/os/linux/zfs/sys/zio_crypt_os.h | 24 +
sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 2 +
sys/contrib/openzfs/include/sys/dsl_dataset.h | 17 +
sys/contrib/openzfs/include/sys/dsl_pool.h | 9 +-
sys/contrib/openzfs/include/sys/fs/zfs.h | 18 +
sys/contrib/openzfs/include/sys/spa.h | 23 +
sys/contrib/openzfs/include/sys/spa_impl.h | 6 +-
sys/contrib/openzfs/include/sys/zfs_stat.h | 23 +-
sys/contrib/openzfs/include/sys/zio_crypt.h | 98 +-
sys/contrib/openzfs/include/sys/zio_crypt_os_icp.h | 31 +
.../lib/libspl/include/os/freebsd/sys/stat.h | 2 -
.../libspl/include/os/linux/sys/ia32/asm_linkage.h | 4 -
sys/contrib/openzfs/lib/libspl/include/sys/acl.h | 10 -
.../openzfs/lib/libspl/include/sys/asm_linkage.h | 6 +-
sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 1 +
sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 20 +-
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 317 ++-
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 11 +-
sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 2 +
sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 3 -
sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c | 27 +-
.../lib/libzfs_core/os/freebsd/libzfs_core_ioctl.c | 110 +-
sys/contrib/openzfs/lib/libzpool/Makefile.am | 4 +-
.../openzfs/lib/libzpool/include/Makefile.am | 3 +-
.../lib/libzpool/include/sys/zio_crypt_os.h | 24 +
sys/contrib/openzfs/lib/libzpool/util.c | 51 +-
sys/contrib/openzfs/man/man4/zfs.4 | 27 +-
sys/contrib/openzfs/man/man7/zfsconcepts.7 | 11 +
sys/contrib/openzfs/man/man7/zfsprops.7 | 44 +-
sys/contrib/openzfs/man/man7/zpool-features.7 | 2 +-
sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 10 +-
sys/contrib/openzfs/man/man7/zpoolprops.7 | 7 +-
sys/contrib/openzfs/man/man8/zfs-receive.8 | 23 +
sys/contrib/openzfs/man/man8/zfs-send.8 | 42 +-
sys/contrib/openzfs/man/man8/zinject.8 | 5 +-
sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 2 +-
sys/contrib/openzfs/man/man8/zpool-reguid.8 | 78 +-
sys/contrib/openzfs/man/man8/zpool-split.8 | 15 +-
sys/contrib/openzfs/man/man8/zpool-status.8 | 13 +-
sys/contrib/openzfs/man/man8/zstream.8 | 344 ++--
sys/contrib/openzfs/module/Kbuild.in | 3 +-
sys/contrib/openzfs/module/Makefile.bsd | 4 +-
sys/contrib/openzfs/module/Makefile.in | 15 +-
sys/contrib/openzfs/module/icp/algs/edonr/edonr.c | 2 -
sys/contrib/openzfs/module/icp/algs/skein/skein.c | 3 +-
sys/contrib/openzfs/module/icp/api/kcf_cipher.c | 2 -
sys/contrib/openzfs/module/icp/api/kcf_ctxops.c | 2 -
sys/contrib/openzfs/module/icp/api/kcf_mac.c | 2 -
.../openzfs/module/icp/core/kcf_mech_tabs.c | 2 -
sys/contrib/openzfs/module/icp/illumos-crypto.c | 9 -
sys/contrib/openzfs/module/lua/lauxlib.c | 4 -
sys/contrib/openzfs/module/lua/lbaselib.c | 4 -
sys/contrib/openzfs/module/lua/lcorolib.c | 4 -
sys/contrib/openzfs/module/lua/lstrlib.c | 4 -
sys/contrib/openzfs/module/lua/ltablib.c | 4 -
sys/contrib/openzfs/module/nvpair/fnvpair.c | 5 +-
sys/contrib/openzfs/module/nvpair/nvpair.c | 6 +-
.../openzfs/module/nvpair/nvpair_alloc_fixed.c | 3 +-
.../openzfs/module/os/freebsd/spl/acl_common.c | 1307 ------------
.../openzfs/module/os/freebsd/spl/spl_atomic.c | 55 +-
.../openzfs/module/os/freebsd/spl/spl_kmem.c | 29 +-
.../openzfs/module/os/freebsd/zfs/crypto_os.c | 8 +-
.../openzfs/module/os/freebsd/zfs/kmod_core.c | 43 +-
.../module/os/freebsd/zfs/zfs_ioctl_compat.c | 363 ----
.../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 4 +-
.../openzfs/module/os/freebsd/zfs/zio_crypt_os.c | 169 ++
.../openzfs/module/os/freebsd/zfs/zvol_os.c | 10 +
sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 5 +-
sys/contrib/openzfs/module/os/linux/zfs/qat.c | 3 +-
.../openzfs/module/os/linux/zfs/qat_compress.c | 3 +-
.../openzfs/module/os/linux/zfs/qat_crypt.c | 3 +-
sys/contrib/openzfs/module/os/linux/zfs/trace.c | 2 +-
.../openzfs/module/os/linux/zfs/vdev_disk.c | 14 +-
.../openzfs/module/os/linux/zfs/zfs_ctldir.c | 75 +-
.../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 2 -
.../openzfs/module/os/linux/zfs/zfs_racct.c | 17 -
.../openzfs/module/os/linux/zfs/zfs_sysfs.c | 4 -
sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 56 +-
.../openzfs/module/os/linux/zfs/zfs_vfsops.c | 79 +-
.../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 25 +-
.../openzfs/module/os/linux/zfs/zio_crypt.c | 2076 --------------------
.../openzfs/module/os/linux/zfs/zpl_ctldir.c | 38 +-
sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 51 +
.../openzfs/module/os/linux/zfs/zpl_inode.c | 7 -
sys/contrib/openzfs/module/zcommon/zfs_namecheck.c | 30 +-
sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 -
sys/contrib/openzfs/module/zfs/dmu_send.c | 3 -
sys/contrib/openzfs/module/zfs/dmu_tx.c | 31 +-
sys/contrib/openzfs/module/zfs/dnode.c | 2 -
sys/contrib/openzfs/module/zfs/dsl_dataset.c | 225 ++-
sys/contrib/openzfs/module/zfs/dsl_deleg.c | 2 -
sys/contrib/openzfs/module/zfs/dsl_destroy.c | 6 +-
sys/contrib/openzfs/module/zfs/dsl_dir.c | 128 +-
sys/contrib/openzfs/module/zfs/dsl_pool.c | 103 +-
sys/contrib/openzfs/module/zfs/dsl_prop.c | 2 -
sys/contrib/openzfs/module/zfs/dsl_scan.c | 6 +-
sys/contrib/openzfs/module/zfs/dsl_synctask.c | 2 -
sys/contrib/openzfs/module/zfs/rrwlock.c | 4 +-
sys/contrib/openzfs/module/zfs/sa.c | 2 -
sys/contrib/openzfs/module/zfs/spa.c | 18 +-
sys/contrib/openzfs/module/zfs/spa_config.c | 3 -
sys/contrib/openzfs/module/zfs/spa_errlog.c | 41 +-
sys/contrib/openzfs/module/zfs/spa_history.c | 3 -
sys/contrib/openzfs/module/zfs/spa_misc.c | 89 +-
sys/contrib/openzfs/module/zfs/vdev.c | 6 +-
.../openzfs/module/zfs/vdev_indirect_births.c | 2 -
.../openzfs/module/zfs/vdev_indirect_mapping.c | 2 -
sys/contrib/openzfs/module/zfs/zap_micro.c | 4 -
sys/contrib/openzfs/module/zfs/zfs_byteswap.c | 2 -
sys/contrib/openzfs/module/zfs/zfs_debug_common.c | 6 -
sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 24 +-
sys/contrib/openzfs/module/zfs/zfs_rlock.c | 2 -
sys/contrib/openzfs/module/zfs/zfs_znode.c | 49 +-
sys/contrib/openzfs/module/zfs/zio.c | 8 +-
.../module/{os/freebsd => }/zfs/zio_crypt.c | 768 +++-----
sys/contrib/openzfs/module/zfs/zio_crypt_os_icp.c | 302 +++
sys/contrib/openzfs/module/zfs/zio_inject.c | 2 -
sys/contrib/openzfs/module/zfs/zrlock.c | 4 -
sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in | 62 +-
sys/contrib/openzfs/scripts/kmodtool | 51 +-
sys/contrib/openzfs/tests/runfiles/common.run | 21 +-
sys/contrib/openzfs/tests/runfiles/linux.run | 6 +-
.../tests/test-runner/bin/test-runner.py.in | 15 +-
sys/contrib/openzfs/tests/unit/test_namecheck.c | 10 +
sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 3 +
.../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 +
.../openzfs/tests/zfs-tests/cmd/getfsuuid.c | 86 +
.../openzfs/tests/zfs-tests/cmd/statfs_nomount.c | 51 +
.../openzfs/tests/zfs-tests/include/commands.cfg | 2 +
.../openzfs/tests/zfs-tests/include/libtest.shlib | 7 +-
.../openzfs/tests/zfs-tests/include/tunables.cfg | 2 +
.../openzfs/tests/zfs-tests/tests/Makefile.am | 20 +-
.../functional/alloc_class/alloc_class_017_pos.ksh | 74 +
.../cli_root/zfs_get/zfs_get_006_neg.ksh | 14 +-
.../cli_root/zpool_create/zpool_create_006_pos.ksh | 4 +-
.../zpool_initialize_multiple_pools.ksh | 2 +-
.../zpool_prefetch/zpool_prefetch_001_pos.ksh | 34 +-
.../cli_root/zpool_status/zpool_status_-v.ksh | 173 ++
.../cli_root/zpool_status/zpool_status_005_pos.ksh | 8 +-
.../cli_root/zpool_status/zpool_status_010_pos.ksh | 87 +
.../cli_root/zpool_status/zpool_status_011_pos.ksh | 102 +
.../tests/functional/dedup/dedup_log_zdb_leak.ksh | 214 ++
.../tests/functional/getfsuuid/cleanup.ksh | 20 +
.../tests/functional/getfsuuid/getfsuuid.kshlib | 48 +
.../functional/getfsuuid/getfsuuid_001_pos.ksh | 127 ++
.../functional/getfsuuid/getfsuuid_002_pos.ksh | 73 +
.../functional/getfsuuid/getfsuuid_003_pos.ksh | 76 +
.../zfs-tests/tests/functional/getfsuuid/setup.ksh | 21 +
.../tests/functional/mmp/mmp_write_slow_disk.ksh | 2 +-
.../tests/functional/mount/mount_loopback.ksh | 9 +-
.../functional/removal/removal_indirect_class.ksh | 73 +
.../replacement/replace_resilver_sit_out.ksh | 18 +-
.../tests/functional/rsend/recv_dot_name_neg.ksh | 54 +
.../functional/rsend/send_large_blocks_reverse.ksh | 104 +
.../functional/snapdir/snapdir_stat_btime.ksh | 88 +
.../functional/snapdir/snapdir_statfs_fsid.ksh | 78 +
.../tests/functional/trim/autotrim_config.ksh | 5 +-
.../zstream/make-invalid-context-streams.py | 74 +
.../zstream/zstream_decompress_004_pos.ksh | 7 +
...01_pos.ksh => zstream_drop_records_001_pos.ksh} | 17 +-
.../functional/zstream/zstream_dump_002_pos.ksh | 15 +
.../functional/zstream/zstream_raw_001_pos.ksh | 10 +-
.../zstream/zstream_recompress_003_pos.ksh | 71 +-
.../zstream/zstream_recompress_004_pos.ksh | 9 +-
.../zstream/zstream_validate_002_neg.ksh | 69 +
sys/modules/zfs/Makefile | 4 +-
sys/modules/zfs/zfs_config.h | 13 +-
sys/modules/zfs/zfs_gitrev.h | 2 +-
237 files changed, 6102 insertions(+), 5796 deletions(-)
diff --cc cddl/lib/libzfs_core/Makefile
index 72b0f519e21d,000000000000..bb108d24f758
mode 100644,000000..100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@@ -1,34 -1,0 +1,33 @@@
+.PATH: ${ZFSTOP}/lib/libzfs_core
+.PATH: ${ZFSTOP}/include
+.PATH: ${ZFSTOP}/include/os/freebsd/zfs
+.PATH: ${ZFSTOP}/module/os/freebsd/zfs
+
+PACKAGE= zfs
+LIB_PACKAGE=
+
+LIB= zfs_core
+LIBADD= nvpair spl zutil
+
+INCS= libzfs_core.h
+SRCS= libzfs_core.c \
- os/freebsd/libzfs_core_ioctl.c \
- zfs_ioctl_compat.c
++ os/freebsd/libzfs_core_ioctl.c
+
+WARNS?= 2
+CSTD= c99
+CFLAGS+= -DIN_BASE
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core
+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core/common
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${ZFSTOP}/module/icp/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -DHAVE_ISSETUGID
+CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+
+.include <bsd.lib.mk>
diff --cc cddl/lib/libzpool/Makefile
index 68908fcb0241,000000000000..109bf51965d2
mode 100644,000000..100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@@ -1,350 -1,0 +1,351 @@@
+.PATH: ${ZFSTOP}/lib/libzpool
+
+# ZFS_COMMON_SRCS
+.PATH: ${ZFSTOP}/module/zfs
+.PATH: ${ZFSTOP}/module/zcommon
+.PATH: ${ZFSTOP}/module/unicode
+# LUA_SRCS
+.PATH: ${ZFSTOP}/module/lua
+# ZSTD_SRCS
+.PATH: ${ZFSTOP}/module/zstd
+.PATH: ${ZFSTOP}/module/zstd/lib/common
+.PATH: ${ZFSTOP}/module/zstd/lib/compress
+.PATH: ${ZFSTOP}/module/zstd/lib/decompress
+
+.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
+.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+ATOMIC_SRCS= opensolaris_atomic.S
+ACFLAGS+= -Wa,--noexecstack
+.else
+.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern
+ATOMIC_SRCS= opensolaris_atomic.c
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+# Don't waste GOT entries on small data.
+PICFLAG= -fPIC
+.endif
+
+PACKAGE= zfs
+LIB_PACKAGE=
+
+LIB= zpool
+
+USER_C = \
+ arc_os.c \
+ kernel.c \
+ util.c \
+ zfs_debug.c
+
+.PATH: ${ZFSTOP}/module/os/linux/zfs
+
+KERNEL_C = \
+ simd_stat.c \
+ zfeature_common.c \
+ zfs_comutil.c \
+ zfs_deleg.c \
+ zfs_fletcher.c \
+ zfs_fletcher_superscalar.c \
+ zfs_fletcher_superscalar4.c \
+ zfs_namecheck.c \
+ zfs_prop.c \
+ zfs_zstd.c \
+ zpool_prop.c \
+ zprop_common.c \
+ abd.c \
+ abd_os.c \
+ aggsum.c \
+ arc.c \
+ blake3_zfs.c \
+ blkptr.c \
+ bplist.c \
+ bpobj.c \
+ bptree.c \
+ bqueue.c \
+ btree.c \
+ brt.c \
+ cityhash.c \
+ dbuf.c \
+ dbuf_stats.c \
+ ddt.c \
+ ddt_log.c \
+ ddt_stats.c \
+ ddt_zap.c \
+ dmu.c \
+ dmu_diff.c \
+ dmu_direct.c \
+ dmu_object.c \
+ dmu_objset.c \
+ dmu_recv.c \
+ dmu_redact.c \
+ dmu_send.c \
+ dmu_traverse.c \
+ dmu_tx.c \
+ dmu_zfetch.c \
+ dnode.c \
+ dnode_sync.c \
+ dsl_bookmark.c \
+ dsl_dataset.c \
+ dsl_deadlist.c \
+ dsl_deleg.c \
+ dsl_dir.c \
+ dsl_crypt.c \
+ dsl_pool.c \
+ dsl_prop.c \
+ dsl_scan.c \
+ dsl_synctask.c \
+ dsl_destroy.c \
+ dsl_userhold.c \
+ edonr_zfs.c \
+ entropy_common.c \
+ error_private.c \
+ fm.c \
+ fse_compress.c \
+ fse_decompress.c \
+ gzip.c \
+ hist.c \
+ hkdf.c \
+ huf_compress.c \
+ huf_decompress.c \
+ lzjb.c \
+ lz4.c \
+ lz4_zfs.c \
+ metaslab.c \
+ mmp.c \
+ multilist.c \
+ objlist.c \
+ pathname.c \
+ pool.c \
+ range_tree.c \
+ refcount.c \
+ rrwlock.c \
+ sa.c \
+ sha2_zfs.c \
+ skein_zfs.c \
+ spa.c \
+ spa_checkpoint.c \
+ spa_config.c \
+ spa_errlog.c \
+ spa_history.c \
+ spa_log_spacemap.c \
+ spa_misc.c \
+ spa_stats.c \
+ space_map.c \
+ space_reftree.c \
+ txg.c \
+ u8_textprep.c \
+ trace.c \
+ uberblock.c \
+ unique.c \
+ vdev.c \
+ vdev_draid.c \
+ vdev_draid_rand.c \
+ vdev_file.c \
+ vdev_indirect_births.c \
+ vdev_indirect.c \
+ vdev_indirect_mapping.c \
+ vdev_initialize.c \
+ vdev_label.c \
+ vdev_label_os.c \
+ vdev_mirror.c \
+ vdev_missing.c \
+ vdev_queue.c \
+ vdev_raidz.c \
+ vdev_raidz_math_aarch64_neon.c \
+ vdev_raidz_math_aarch64_neonx2.c \
+ vdev_raidz_math_avx2.c \
+ vdev_raidz_math_avx512bw.c \
+ vdev_raidz_math_avx512f.c \
+ vdev_raidz_math.c \
+ vdev_raidz_math_scalar.c \
+ vdev_rebuild.c \
+ vdev_removal.c \
+ vdev_root.c \
+ vdev_trim.c \
+ zap.c \
+ zap_fat.c \
+ zap_impl.c \
+ zap_leaf.c \
+ zap_micro.c \
+ zcp.c \
+ zcp_get.c \
+ zcp_global.c \
+ zcp_iter.c \
+ zcp_set.c \
+ zcp_synctask.c \
+ zfeature.c \
+ zfs_byteswap.c \
+ zfs_chksum.c \
+ zfs_crrd.c \
+ zfs_debug_common.c \
+ zfs_file_os.c \
+ zfs_fm.c \
+ zfs_fuid.c \
+ zfs_impl.c \
+ zfs_sa.c \
+ zfs_znode.c \
+ zfs_racct.c \
+ zfs_ratelimit.c \
+ zfs_rlock.c \
+ zil.c \
+ zio.c \
+ zio_checksum.c \
+ zio_compress.c \
+ zio_crypt.c \
++ zio_crypt_os_icp.c \
+ zio_inject.c \
+ zle.c \
+ zrlock.c \
+ zstd_common.c \
+ zstd_compress.c \
+ zstd_compress_literals.c \
+ zstd_compress_sequences.c \
+ zstd_compress_superblock.c \
+ zstd_ddict.c \
+ zstd_decompress.c \
+ zstd_decompress_block.c \
+ zstd_double_fast.c \
+ zstd_fast.c \
+ zstd_lazy.c \
+ zstd_ldm.c \
+ zstd_opt.c \
+ zstd_preSplit.c \
+ zthr.c
+
+ARCH_C =
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+ARCH_C += vdev_raidz_math_sse2.c \
+ vdev_raidz_math_ssse3.c \
+ zfs_fletcher_intel.c \
+ zfs_fletcher_sse.c
+CFLAGS += -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3
+.endif
+.if ${MACHINE_ARCH} == "amd64"
+ARCH_C += zfs_fletcher_avx512.c
+CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_AVX2 -DHAVE_TOOLCHAIN_AVX \
+ -DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512BW
+.endif
+.if ${MACHINE_CPUARCH} == "aarch64"
+ARCH_C += zfs_fletcher_aarch64_neon.c
+.endif
+
+LUA_C = \
+ lapi.c \
+ lauxlib.c \
+ lbaselib.c \
+ lcode.c \
+ lcompat.c \
+ lcorolib.c \
+ lctype.c \
+ ldebug.c \
+ ldo.c \
+ lfunc.c \
+ lgc.c \
+ llex.c \
+ lmem.c \
+ lobject.c \
+ lopcodes.c \
+ lparser.c \
+ lstate.c \
+ lstring.c \
+ lstrlib.c \
+ ltable.c \
+ ltablib.c \
+ ltm.c \
+ lvm.c \
+ lzio.c
+
+SRCS+= ${USER_C} ${KERNEL_C} ${LUA_C} ${ARCH_C}
+
+
+WARNS?= 2
+CFLAGS+= \
+ -DIN_BASE \
+ -I${ZFSTOP}/include \
+ -I${ZFSTOP}/lib/libspl/include \
+ -I${ZFSTOP}/lib/libspl/include/os/freebsd \
+ -I${ZFSTOP}/lib/libzpool/include \
+ -I${SRCTOP}/sys \
+ -I${SRCTOP}/cddl/compat/opensolaris/include \
+ -I${ZFSTOP}/module/icp/include \
+ -I${SRCTOP}/compat/linuxkpi/common/include/linux \
+ -include ${ZFSTOP}/include/sys/simd_config.h \
+ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+ -DHAVE_ISSETUGID \
+ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \
+ -I${SRCTOP}/sys/modules/zfs \
+ -I${ZFSTOP}/include/os/freebsd/zfs \
+ -DLIB_ZPOOL_BUILD -DZFS_DEBUG -DXXH_INLINE_ALL \
+
+# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look
+# into libthr private structures. That's sooo evil, but it's only for
+# ZFS debugging tools needs.
+CFLAGS+= -DWANTS_MUTEX_OWNED
+CFLAGS+= -I${SRCTOP}/lib/libpthread/thread
+CFLAGS+= -I${SRCTOP}/lib/libpthread/sys
+CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include
+
+LIBADD= md pthread z spl icp nvpair avl umem
+
+CSTD= c99
+
+# Since there are many asserts in this library, it makes no sense to compile
+# it without debugging.
+
+CFLAGS+= -g -DDEBUG=1
+
+CFLAGS.gcc+= -Wno-pointer-to-int-cast
+
+# Some versions of LLVM contain duplicate typedefs in the <*intrin.h> headers,
+# which are not allowed prior to C11; since libzpool is built with C99, make
+# this not be an error.
+CFLAGS.clang+= -Wno-error=typedef-redefinition
+
+# Pointer values are used as debugging "tags" to mark reference count
+# ownerships and in some cases the tag reference is dropped after an
+# object is freed.
+CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE}
+CFLAGS.entropy_common.c= -fno-tree-vectorize
+CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.error_private.c= -fno-tree-vectorize
+CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.fse_compress.c= -fno-tree-vectorize
+CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.fse_decompress.c= -fno-tree-vectorize
+CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.hist.c= -fno-tree-vectorize
+CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.huf_compress.c= -fno-tree-vectorize
+CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.huf_decompress.c= -fno-tree-vectorize
+CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.pool.c= -fno-tree-vectorize
+CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.xxhash.c= -fno-tree-vectorize
+CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress.c= -fno-tree-vectorize
+CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize
+CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize
+CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize
+CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_double_fast.c= -fno-tree-vectorize
+CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_fast.c= -fno-tree-vectorize
+CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_lazy.c= -fno-tree-vectorize
+CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_ldm.c= -fno-tree-vectorize
+CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_opt.c= -fno-tree-vectorize
+CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_ddict.c= -fno-tree-vectorize
+CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_decompress.c= -fno-tree-vectorize
+CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize
+CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+
+.include <bsd.lib.mk>
diff --cc cddl/lib/libzutil/Makefile
index 93b0ffdb6fac,000000000000..244ec707b891
mode 100644,000000..100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@@ -1,42 -1,0 +1,39 @@@
+.PATH: ${ZFSTOP}/lib/libzutil
+.PATH: ${ZFSTOP}/lib/libzutil/os/freebsd
+.PATH: ${ZFSTOP}/module/os/freebsd/zfs
+
+PACKAGE= zfs
+LIB_PACKAGE=
+
+LIB= zutil
+LIBADD= avl geom m
+
+INCS = zutil_import.h
+
+SRCS = \
+ zutil_device_path.c \
+ zutil_import.c \
+ zutil_import.h \
+ zutil_nicenum.c \
+ zutil_pool.c
+
+SRCS += \
+ os/freebsd/zutil_device_path_os.c \
+ os/freebsd/zutil_import_os.c
+
- SRCS += zfs_ioctl_compat.c
-
-
+WARNS?= 2
+CSTD= c99
+
+CFLAGS+= -I${ZFSTOP}/include
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
+CFLAGS+= -I${ZFSTOP}/lib/libzutil
+CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
+CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+
+.include <bsd.lib.mk>
diff --cc cddl/usr.bin/zstream/Makefile
index c5f9ce2b4999,000000000000..0562e6545056
mode 100644,000000..100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@@ -1,49 -1,0 +1,49 @@@
+.PATH: ${ZFSTOP}/cmd/zstream
+.PATH: ${ZFSTOP}/man/man8
+
+PACKAGE= zfs
+PROG= zstream
+MAN= zstream.8
+MLINKS= zstream.8 zstreamdump.8
+INCS= zstream.h
+SRCS= \
+ zstream.c \
+ zstream_backtrace.c \
+ zstream_byteswap.c \
+ zstream_chain.c \
+ zstream_decompress.c \
- zstream_drop_record.c \
++ zstream_drop_records.c \
+ zstream_dump.c \
+ zstream_fletcher4.c \
+ zstream_io.c \
+ zstream_queue.c \
+ zstream_raw.c \
+ zstream_recompress.c \
+ zstream_redup.c \
+ zstream_selftest.c \
+ zstream_selftest_queue.c \
+ zstream_token.c \
+ zstream_util.c \
+ zstream_validate.c
+
+SYMLINKS= zstream ${BINDIR}/zstreamdump
+
+WARNS?= 2
+CFLAGS+= \
+ -DIN_BASE \
+ -DZFS_DEBUG \
+ -I${ZFSTOP}/include \
+ -I${ZFSTOP}/lib/libspl/include \
+ -I${ZFSTOP}/lib/libspl/include/os/freebsd \
+ -I${ZFSTOP}/lib/libzpool/include \
+ -I${SRCTOP}/sys \
+ -I${SRCTOP}/cddl/compat/opensolaris/include \
+ -I${ZFSTOP}/module/icp/include \
+ -include ${ZFSTOP}/include/sys/simd_config.h \
+ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
+ -DHAVE_ISSETUGID \
+ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
+
+LIBADD= geom m nvpair umem avl spl zfs_core zfs zutil zpool pthread
+
+.include <bsd.prog.mk>
diff --cc sys/conf/files
index f8f3f71685dd,000000000000..495881e7ae0c
mode 100644,000000..100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@@ -1,5433 -1,0 +1,5433 @@@
+#
+# The long compile-with and dependency lines are required because of
+# limitations in config: backslash-newline doesn't work in strings, and
+# dependency lines other than the first are silently ignored.
+#
+acpi_quirks.h optional acpi \
+ dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
+ no-obj no-implicit-rule before-depend \
+ clean "acpi_quirks.h"
+bhnd_nvram_map.h optional bhnd \
+ dependency "$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
+ compile-with "sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -h" \
+ no-obj no-implicit-rule before-depend \
+ clean "bhnd_nvram_map.h"
+bhnd_nvram_map_data.h optional bhnd \
+ dependency "$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
+ compile-with "sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -d" \
+ no-obj no-implicit-rule before-depend \
+ clean "bhnd_nvram_map_data.h"
+fdt_static_dtb.h optional fdt fdt_dtb_static \
+ compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.OBJDIR}'" \
+ dependency "${FDT_DTS_FILE:T:R}.dtb" \
+ no-obj no-implicit-rule before-depend \
+ clean "fdt_static_dtb.h"
+feeder_eq_gen.h optional sound \
+ dependency "$S/tools/sound/feeder_eq_mkfilter.awk" \
+ compile-with "${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "feeder_eq_gen.h"
+feeder_rate_gen.h optional sound \
+ dependency "$S/tools/sound/feeder_rate_mkfilter.awk" \
+ compile-with "${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "feeder_rate_gen.h"
+font.h optional sc_dflt_font \
+ compile-with "uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
+snd_fxdiv_gen.h optional sound \
+ dependency "$S/tools/sound/snd_fxdiv_gen.awk" \
+ compile-with "${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "snd_fxdiv_gen.h"
+miidevs.h optional miibus | mii \
+ dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
+ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
+ no-obj no-implicit-rule before-depend \
+ clean "miidevs.h"
+kbdmuxmap.h optional kbdmux_dflt_keymap \
+ compile-with "${KEYMAP} -L ${KBDMUX_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend \
+ clean "kbdmuxmap.h"
+teken_state.h optional sc | vt \
+ dependency "$S/teken/gensequences $S/teken/sequences" \
+ compile-with "${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "teken_state.h"
+ukbdmap.h optional ukbd_dflt_keymap \
+ compile-with "${KEYMAP} -L ${UKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend \
+ clean "ukbdmap.h"
+usbdevs.h optional usb | hid \
+ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
+ no-obj no-implicit-rule before-depend \
+ clean "usbdevs.h"
+usbdevs_data.h optional usb \
+ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
+ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
+ no-obj no-implicit-rule before-depend \
+ clean "usbdevs_data.h"
+sdiodevs.h optional mmccam \
+ dependency "$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
+ compile-with "${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -h" \
+ no-obj no-implicit-rule before-depend \
+ clean "sdiodevs.h"
+sdiodevs_data.h optional mmccam \
+ dependency "$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
+ compile-with "${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -d" \
+ no-obj no-implicit-rule before-depend \
+ clean "sdiodevs_data.h"
+cam/cam.c optional scbus
+cam/cam_compat.c optional scbus
+cam/cam_iosched.c optional scbus
+cam/cam_periph.c optional scbus
+cam/cam_queue.c optional scbus
+cam/cam_sim.c optional scbus
+cam/cam_xpt.c optional scbus
+cam/ata/ata_all.c optional scbus
+cam/ata/ata_xpt.c optional scbus
+cam/ata/ata_pmp.c optional scbus
+cam/nvme/nvme_all.c optional scbus
+cam/nvme/nvme_da.c optional nda | da
+cam/nvme/nvme_xpt.c optional scbus
+cam/scsi/scsi_xpt.c optional scbus
+cam/scsi/scsi_all.c optional scbus
+cam/scsi/scsi_cd.c optional cd
+cam/scsi/scsi_ch.c optional ch
+cam/ata/ata_da.c optional ada | da
+cam/ctl/ctl.c optional ctl
+cam/ctl/ctl_backend.c optional ctl
+cam/ctl/ctl_backend_block.c optional ctl
+cam/ctl/ctl_backend_ramdisk.c optional ctl
+cam/ctl/ctl_cmd_table.c optional ctl
+cam/ctl/ctl_frontend.c optional ctl
+cam/ctl/ctl_frontend_cam_sim.c optional ctl
+cam/ctl/ctl_frontend_ioctl.c optional ctl
+cam/ctl/ctl_frontend_iscsi.c optional ctl cfiscsi
+cam/ctl/ctl_ha.c optional ctl
+cam/ctl/ctl_nvme_all.c optional ctl
+cam/ctl/ctl_nvme_cmd_table.c optional ctl
+cam/ctl/ctl_scsi_all.c optional ctl
+cam/ctl/ctl_tpc.c optional ctl
+cam/ctl/ctl_tpc_local.c optional ctl
+cam/ctl/ctl_error.c optional ctl
+cam/ctl/ctl_util.c optional ctl
+cam/ctl/scsi_ctl.c optional ctl
+cam/mmc/mmc_xpt.c optional scbus mmccam
+cam/mmc/mmc_sim.c optional scbus mmccam
+cam/mmc/mmc_sim_if.m optional scbus mmccam
+cam/mmc/mmc_da.c optional scbus mmccam da
+cam/scsi/scsi_da.c optional da
+cam/scsi/scsi_pass.c optional pass
+cam/scsi/scsi_pt.c optional pt
+cam/scsi/scsi_sa.c optional sa
+cam/scsi/scsi_enc.c optional ses
+cam/scsi/scsi_enc_ses.c optional ses
+cam/scsi/scsi_enc_safte.c optional ses
+cam/scsi/scsi_sg.c optional sg
+cam/scsi/scsi_targ_bh.c optional targbh
+cam/scsi/scsi_target.c optional targ
+cam/scsi/smp_all.c optional scbus
+
+# shared between zfs and dtrace
+cddl/compat/opensolaris/kern/opensolaris.c optional dtrace compile-with "${CDDL_C}"
+cddl/compat/opensolaris/kern/opensolaris_proc.c optional zfs | dtrace compile-with "${CDDL_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_misc.c optional zfs | dtrace compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_cmn_err.c optional zfs | dtrace compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_taskq.c optional zfs | dtrace compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_kmem.c optional zfs | dtrace compile-with "${ZFS_C}"
+
+#zfs solaris portability layer
+contrib/openzfs/module/os/freebsd/spl/acl_common.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/callb.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/list.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_acl.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_dtrace.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_kstat.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_policy.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_procfs_list.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_string.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_sunddi.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_uio.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_vfs.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_vm.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_zlib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/os/freebsd/spl/spl_zone.c optional zfs compile-with "${ZFS_C}"
+
+
+
+# zfs specific
+
+#zfs avl
+contrib/openzfs/module/avl/avl.c optional zfs compile-with "${ZFS_C}"
+
+# zfs lua support
+contrib/openzfs/module/lua/lapi.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lauxlib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lbaselib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lcode.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lcompat.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lcorolib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lctype.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/ldebug.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINITE_RECURSION}"
+contrib/openzfs/module/lua/lfunc.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lgc.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/llex.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lmem.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lobject.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lopcodes.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lparser.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lstate.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lstring.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lstrlib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/ltable.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/ltablib.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/ltm.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lvm.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/lua/lzio.c optional zfs compile-with "${ZFS_C}"
+
+# zfs nvpair support
+contrib/openzfs/module/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}"
+contrib/openzfs/module/nvpair/nvpair.c optional zfs compile-with "${ZFS_RPC_C} ${NO_WSTRINGOP_OVERREAD}"
*** 14242 LINES SKIPPED ***