Date: Mon, 17 Nov 2025 16:12:32 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8ac904ce090b - main - zfs: merge openzfs/zfs@e63d026b9 Message-ID: <202511171612.5AHGCWHj068007@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=8ac904ce090b1c2e355da8aa122ca2252183f4e1 commit 8ac904ce090b1c2e355da8aa122ca2252183f4e1 Merge: 5f624d923db0 e63d026b91b8 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2025-11-17 16:11:32 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2025-11-17 16:11:32 +0000 zfs: merge openzfs/zfs@e63d026b9 Notable upstream pull request merges: #17477 02fdd26e5 Add knob to disable slow io notifications #17792 d0294aa75 Update dnode_next_offset_level to accept blkid instead of offset #17824 8c225ff1b Fix gang write late_arrival bug #17861 -multiple Lift userspace definitions out of zfs_context.h #17872 dcada084b Pass flags to more DMU write/hold functions #17875 ec268cdf9 Fix caching of DDT log and BRT #17875 ea125eeb5 BRT: Round bv_entcount up to BRT_BLOCKSIZE #17877 6cfc3dba9 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage #17885 e63d026b9 cmd/zpool cstyle issues #17890 b4f073b5a Add BRT support to zpool prefetch command #17903 baefe098e ZIO: Set minimum number of free issue threads to 32 #17906 6e12f0bd7 spa_misc: add an API for spa_namespace_lock #17908 e26b9fc87 FreeBSD: Add support for _PC_CASE_INSENSITIVE #17911 -multiple Update library ABI versions for v2.4.0 #17915 8aaed7dc4 BRT: Fix ranges to blocks conversion math #17916 cc5cae547 BRT: Increase block size from 4KB to 8KB #17921 72b2a9571 ZAP: Remove dmu_object_info_from_dnode() call Obtained from: OpenZFS OpenZFS commit: e63d026b91b822dd9b363ab9a1e39d9a66493601 .../.github/workflows/scripts/generate-ci-type.py | 10 +- .../.github/workflows/scripts/qemu-2-start.sh | 20 +- .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 38 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/autogen.sh | 61 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 1 + sys/contrib/openzfs/cmd/zdb/zdb.c | 9 +- sys/contrib/openzfs/cmd/zfs/zfs_project.c | 36 +- sys/contrib/openzfs/cmd/zhack.c | 1 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 445 ++++--- sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 8 +- sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- sys/contrib/openzfs/cmd/ztest.c | 57 +- sys/contrib/openzfs/config/Rules.am | 4 +- sys/contrib/openzfs/config/deb.am | 8 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 8 +- sys/contrib/openzfs/contrib/debian/clean | 4 +- sys/contrib/openzfs/contrib/debian/control | 26 +- .../{openzfs-libzfs6.docs => openzfs-libzfs7.docs} | 0 ...bzfs6.install.in => openzfs-libzfs7.install.in} | 0 ...enzfs-libzpool6.docs => openzfs-libzpool7.docs} | 0 ...ol6.install.in => openzfs-libzpool7.install.in} | 0 sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/libzpool.h | 51 + sys/contrib/openzfs/include/libzutil.h | 1 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 4 +- .../openzfs/include/os/freebsd/spl/sys/mod.h | 3 + .../os/freebsd/{spl => zfs}/sys/trace_zfs.h | 0 .../{spl/sys/sdt.h => zfs/sys/zfs_debug_os.h} | 9 +- sys/contrib/openzfs/include/os/linux/Makefile.am | 2 +- .../openzfs/include/os/linux/spl/sys/sysmacros.h | 8 - .../include/os/linux/zfs/sys/zfs_debug_os.h | 29 + sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/brt_impl.h | 2 +- sys/contrib/openzfs/include/sys/crypto/common.h | 2 + sys/contrib/openzfs/include/sys/dmu.h | 8 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 4 +- sys/contrib/openzfs/include/sys/spa.h | 14 +- sys/contrib/openzfs/include/sys/vdev_impl.h | 1 + sys/contrib/openzfs/include/sys/zfs_acl.h | 2 +- sys/contrib/openzfs/include/sys/zfs_bootenv.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 686 +--------- sys/contrib/openzfs/include/sys/zfs_debug.h | 1 + sys/contrib/openzfs/include/sys/zfs_project.h | 10 +- sys/contrib/openzfs/lib/libicp/Makefile.am | 6 +- sys/contrib/openzfs/lib/libnvpair/Makefile.am | 2 +- sys/contrib/openzfs/lib/libspl/Makefile.am | 12 + sys/contrib/openzfs/lib/libspl/condvar.c | 153 +++ sys/contrib/openzfs/lib/libspl/cred.c | 64 + sys/contrib/openzfs/lib/libspl/include/Makefile.am | 26 +- sys/contrib/openzfs/lib/libspl/include/libspl.h | 40 + .../lib/libspl/include/os/freebsd/sys/param.h | 2 + .../libspl/include/os/freebsd/sys/zfs_context_os.h | 35 - .../lib/libspl/include/os/linux/sys/param.h | 2 + .../os/linux/sys/{zfs_context_os.h => vfs.h} | 10 +- sys/contrib/openzfs/lib/libspl/include/sys/acl.h | 4 - sys/contrib/openzfs/lib/libspl/include/sys/callb.h | 29 +- .../openzfs/lib/libspl/include/sys/cmn_err.h | 27 + .../openzfs/lib/libspl/include/sys/condvar.h | 65 + sys/contrib/openzfs/lib/libspl/include/sys/cred.h | 18 + sys/contrib/openzfs/lib/libspl/include/sys/debug.h | 24 + sys/contrib/openzfs/lib/libspl/include/sys/kmem.h | 66 +- sys/contrib/openzfs/lib/libspl/include/sys/kstat.h | 743 +---------- sys/contrib/openzfs/lib/libspl/include/sys/misc.h | 40 + sys/contrib/openzfs/lib/libspl/include/sys/mutex.h | 58 + .../openzfs/lib/libspl/include/sys/procfs_list.h | 69 + .../openzfs/lib/libspl/include/sys/random.h | 52 + .../openzfs/lib/libspl/include/sys/rwlock.h | 62 + sys/contrib/openzfs/lib/libspl/include/sys/sid.h | 44 + .../openzfs/lib/libspl/include/sys/string.h | 3 + .../openzfs/lib/libspl/include/sys/sunddi.h | 8 +- .../libspl/include/{os/linux => }/sys/sysmacros.h | 43 +- sys/contrib/openzfs/lib/libspl/include/sys/systm.h | 36 + sys/contrib/openzfs/lib/libspl/include/sys/taskq.h | 119 ++ .../openzfs/lib/libspl/include/sys/thread.h | 79 ++ sys/contrib/openzfs/lib/libspl/include/sys/timer.h | 64 + sys/contrib/openzfs/lib/libspl/include/sys/trace.h | 73 + .../openzfs/lib/libspl/include/sys/trace_spl.h | 24 - .../openzfs/lib/libspl/include/sys/trace_zfs.h | 24 - sys/contrib/openzfs/lib/libspl/include/sys/tsd.h | 42 + .../openzfs/lib/libspl/include/sys/tunables.h | 12 +- sys/contrib/openzfs/lib/libspl/include/sys/types.h | 4 + sys/contrib/openzfs/lib/libspl/include/sys/vnode.h | 35 +- sys/contrib/openzfs/lib/libspl/include/sys/zone.h | 18 +- sys/contrib/openzfs/lib/libspl/include/umem.h | 1 + sys/contrib/openzfs/lib/libspl/kmem.c | 102 ++ sys/contrib/openzfs/lib/libspl/kstat.c | 64 + sys/contrib/openzfs/lib/libspl/libspl.c | 67 + sys/contrib/openzfs/lib/libspl/libspl_impl.h | 7 + sys/contrib/openzfs/lib/libspl/mutex.c | 89 ++ sys/contrib/openzfs/lib/libspl/procfs_list.c | 93 ++ sys/contrib/openzfs/lib/libspl/random.c | 101 ++ sys/contrib/openzfs/lib/libspl/rwlock.c | 108 ++ sys/contrib/openzfs/lib/libspl/sid.c | 47 + .../openzfs/lib/{libzpool => libspl}/taskq.c | 44 +- sys/contrib/openzfs/lib/libspl/thread.c | 118 ++ sys/contrib/openzfs/lib/libuutil/libuutil.abi | 1408 ++++++++++++++++---- sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 933 +++++++++++-- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 8 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 5 +- .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 37 + .../openzfs/lib/libzfs_core/libzfs_core.abi | 1163 ++++++++++++++-- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 2 +- sys/contrib/openzfs/lib/libzpool/Makefile.am | 7 +- .../openzfs/lib/libzpool/include/Makefile.am | 8 + .../{libspl => libzpool}/include/sys/abd_impl_os.h | 0 .../lib/{libspl => libzpool}/include/sys/abd_os.h | 0 .../include/sys/trace_zfs.h} | 0 .../lib/libzpool/include/sys/zfs_bootenv_os.h | 39 + .../lib/libzpool/include/sys/zfs_context_os.h | 34 + .../lib/libzpool/include/sys/zfs_debug_os.h | 29 + sys/contrib/openzfs/lib/libzpool/kernel.c | 662 +-------- sys/contrib/openzfs/lib/libzpool/util.c | 1 + sys/contrib/openzfs/man/man4/zfs.4 | 42 +- sys/contrib/openzfs/man/man7/vdevprops.7 | 8 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 + sys/contrib/openzfs/man/man8/zfs-jail.8 | 79 +- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 22 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 73 +- sys/contrib/openzfs/man/man8/zpool-prefetch.8 | 27 +- sys/contrib/openzfs/module/Kbuild.in | 3 +- sys/contrib/openzfs/module/Makefile.bsd | 24 - sys/contrib/openzfs/module/icp/spi/kcf_spi.c | 1 - .../openzfs/module/os/freebsd/spl/spl_uio.c | 2 +- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 5 +- sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 10 +- .../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 8 +- .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 20 +- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 12 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 14 - sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 3 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 3 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 93 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 6 +- sys/contrib/openzfs/module/zcommon/zpool_prop.c | 3 + sys/contrib/openzfs/module/zfs/arc.c | 8 +- sys/contrib/openzfs/module/zfs/bpobj.c | 7 +- sys/contrib/openzfs/module/zfs/bptree.c | 9 +- sys/contrib/openzfs/module/zfs/brt.c | 48 +- sys/contrib/openzfs/module/zfs/dbuf.c | 5 +- sys/contrib/openzfs/module/zfs/ddt_log.c | 7 +- sys/contrib/openzfs/module/zfs/dmu.c | 27 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 6 +- sys/contrib/openzfs/module/zfs/dnode.c | 156 +-- sys/contrib/openzfs/module/zfs/metaslab.c | 8 +- sys/contrib/openzfs/module/zfs/mmp.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 281 ++-- sys/contrib/openzfs/module/zfs/spa_checkpoint.c | 2 +- sys/contrib/openzfs/module/zfs/spa_config.c | 8 +- sys/contrib/openzfs/module/zfs/spa_history.c | 5 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 110 +- sys/contrib/openzfs/module/zfs/space_map.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 86 +- .../openzfs/module/zfs/vdev_indirect_births.c | 2 +- .../openzfs/module/zfs/vdev_indirect_mapping.c | 5 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_label.c | 33 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 20 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 12 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 9 +- sys/contrib/openzfs/module/zfs/zfs_fuid.c | 4 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 41 +- sys/contrib/openzfs/module/zfs/zio.c | 13 +- sys/contrib/openzfs/module/zfs/zio_inject.c | 8 +- sys/contrib/openzfs/module/zfs/zvol.c | 9 +- .../openzfs/module/zstd/include/aarch64_compat.h | 38 - .../openzfs/module/zstd/lib/common/compiler.h | 3 - .../openzfs/module/zstd/lib/common/zstd_internal.h | 9 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 44 +- sys/contrib/openzfs/scripts/Makefile.am | 4 +- sys/contrib/openzfs/scripts/spdxcheck.pl | 6 +- sys/contrib/openzfs/scripts/zfs2zol-patch.sed | 32 - sys/contrib/openzfs/scripts/zol2zfs-patch.sed | 20 - sys/contrib/openzfs/tests/runfiles/common.run | 2 +- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 5 +- sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c | 3 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../functional/cli_root/zpool_get/vdev_get.cfg | 1 + .../zpool_prefetch/zpool_prefetch_001_pos.ksh | 12 +- .../zpool_prefetch/zpool_prefetch_002_pos.ksh | 95 ++ .../tests/functional/events/zed_slow_io.ksh | 44 +- .../tests/functional/trim/autotrim_config.ksh | 2 +- 190 files changed, 7048 insertions(+), 3699 deletions(-) diff --cc sys/contrib/openzfs/README.md index a90736bb56b7,000000000000..a39b88fedd12 mode 100644,000000..100644 --- a/sys/contrib/openzfs/README.md +++ b/sys/contrib/openzfs/README.md @@@ -1,35 -1,0 +1,35 @@@ + + +OpenZFS is an advanced file system and volume manager which was originally +developed for Solaris and is now maintained by the OpenZFS community. +This repository contains the code for running OpenZFS on Linux and FreeBSD. + +[](https://codecov.io/gh/openzfs/zfs) +[](https://scan.coverity.com/projects/openzfs-zfs) + +# Official Resources + + * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo - * [ZoL Site](https://zfsonlinux.org) - Linux release info & links ++ * [ZoL site](https://zfsonlinux.org) - Linux release info & links + * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html) + * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc) + +# Installation + +Full documentation for installing OpenZFS on your favorite operating system can +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html). + +# Contribute & Develop + +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md). + +We have a [Code of Conduct](./CODE_OF_CONDUCT.md). + +# Release + +OpenZFS is released under a CDDL license. +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197` + +# Supported Kernels + * The `META` file contains the officially recognized supported Linux kernel versions. + * Supported FreeBSD versions are any supported branches and releases starting from 13.0-RELEASE. diff --cc sys/contrib/openzfs/include/libzpool.h index 000000000000,95991e68116e..95991e68116e mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/libzpool.h +++ b/sys/contrib/openzfs/include/libzpool.h diff --cc sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h index 000000000000,2841809528b6..2841809528b6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h +++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_debug_os.h diff --cc sys/contrib/openzfs/lib/libspl/condvar.c index 000000000000,3d70fe152089..3d70fe152089 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/condvar.c +++ b/sys/contrib/openzfs/lib/libspl/condvar.c diff --cc sys/contrib/openzfs/lib/libspl/cred.c index 000000000000,130323ea91a7..130323ea91a7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/cred.c +++ b/sys/contrib/openzfs/lib/libspl/cred.c diff --cc sys/contrib/openzfs/lib/libspl/include/libspl.h index 000000000000,68756bb9597b..68756bb9597b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/libspl.h +++ b/sys/contrib/openzfs/lib/libspl/include/libspl.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/condvar.h index 000000000000,9a05c41d1510..9a05c41d1510 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/condvar.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/misc.h index 000000000000,171bbc1de798..171bbc1de798 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/misc.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/misc.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/mutex.h index 000000000000,1da0e632d60f..1da0e632d60f mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/mutex.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/mutex.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h index 000000000000,93b80a4bfdb6..93b80a4bfdb6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/procfs_list.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/random.h index 000000000000,d11580829ed2..d11580829ed2 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/random.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/random.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h index 000000000000,9f82f270d939..9f82f270d939 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/rwlock.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/sid.h index 000000000000,74789c5d9a62..74789c5d9a62 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/sid.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/sid.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/systm.h index 000000000000,f984125c3315..f984125c3315 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/systm.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/systm.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/taskq.h index 000000000000,fbe3f388c05f..fbe3f388c05f mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/taskq.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/taskq.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/thread.h index 000000000000,6390c5bfd863..6390c5bfd863 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/thread.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/thread.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/timer.h index 000000000000,850d11f063c3..850d11f063c3 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/timer.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/timer.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/trace.h index 000000000000,17b812faed20..17b812faed20 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/trace.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/trace.h diff --cc sys/contrib/openzfs/lib/libspl/include/sys/tsd.h index 000000000000,fa91519b3de5..fa91519b3de5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/tsd.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/tsd.h diff --cc sys/contrib/openzfs/lib/libspl/kmem.c index 000000000000,c64e94597cf4..c64e94597cf4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/kmem.c +++ b/sys/contrib/openzfs/lib/libspl/kmem.c diff --cc sys/contrib/openzfs/lib/libspl/kstat.c index 000000000000,af4b870edadf..af4b870edadf mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/kstat.c +++ b/sys/contrib/openzfs/lib/libspl/kstat.c diff --cc sys/contrib/openzfs/lib/libspl/libspl.c index 000000000000,208b3e428536..208b3e428536 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/libspl.c +++ b/sys/contrib/openzfs/lib/libspl/libspl.c diff --cc sys/contrib/openzfs/lib/libspl/mutex.c index 000000000000,36e5bec396ed..36e5bec396ed mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/mutex.c +++ b/sys/contrib/openzfs/lib/libspl/mutex.c diff --cc sys/contrib/openzfs/lib/libspl/procfs_list.c index 000000000000,0ce327db6343..0ce327db6343 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/procfs_list.c +++ b/sys/contrib/openzfs/lib/libspl/procfs_list.c diff --cc sys/contrib/openzfs/lib/libspl/random.c index 000000000000,c6f0ee7ae0f7..c6f0ee7ae0f7 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/random.c +++ b/sys/contrib/openzfs/lib/libspl/random.c diff --cc sys/contrib/openzfs/lib/libspl/rwlock.c index 000000000000,3712829ef594..3712829ef594 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/rwlock.c +++ b/sys/contrib/openzfs/lib/libspl/rwlock.c diff --cc sys/contrib/openzfs/lib/libspl/sid.c index 000000000000,b7d5b5f2e778..b7d5b5f2e778 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/sid.c +++ b/sys/contrib/openzfs/lib/libspl/sid.c diff --cc sys/contrib/openzfs/lib/libspl/thread.c index 000000000000,f00e0a01a06b..f00e0a01a06b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libspl/thread.c +++ b/sys/contrib/openzfs/lib/libspl/thread.c diff --cc sys/contrib/openzfs/lib/libzpool/include/Makefile.am index 000000000000,6cfa2d5ce089..6cfa2d5ce089 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/Makefile.am +++ b/sys/contrib/openzfs/lib/libzpool/include/Makefile.am diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h index 000000000000,44afbb6f5b6b..44afbb6f5b6b mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_bootenv_os.h diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h index 000000000000,4dcf386e3351..4dcf386e3351 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_context_os.h diff --cc sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h index 000000000000,b59165a6c903..b59165a6c903 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h +++ b/sys/contrib/openzfs/lib/libzpool/include/sys/zfs_debug_os.h diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh index 000000000000,f34f8c36e592..f34f8c36e592 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_prefetch/zpool_prefetch_002_pos.kshhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511171612.5AHGCWHj068007>
