The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=66e85755595a451db490d2fe24267d85db4b09c2
commit 66e85755595a451db490d2fe24267d85db4b09c2 Merge: c51876a10731 89f729dcca87 Author: Martin Matuska <[email protected]> AuthorDate: 2025-12-07 21:38:13 +0000 Commit: Martin Matuska <[email protected]> CommitDate: 2025-12-07 21:38:13 +0000 zfs: merge openzfs/zfs@89f729dcc Notable upstream pull request merges: #17932 1f3444f2b zpool: fix special vdev -v -o conflict #17934 -multiple Remove libuutil #17941 88d012a1d Fix snapshot automount expiry cancellation deadlock #17942 36e4f1888 Fix taskq NULL pointer dereference on timer race #17946 39303feba chksum: run 256K benchmark on demand, preserve chksum_stat_data #17948 -multiple Remove libtpool #17957 e37937f42 ztest: fix broken random call #17960 928eccc5b DDT: Reduce global DDT lock scope during writes #17961 48f33c1ef DDT: Make children writes inherit allocator #17975 7f7d4934c FreeBSD: Fix uninitialized variable error #17980 a5b665df3 DDT: Switch to using wmsums for lookup stats #18004 ffaea0831 FreeBSD: Remove HAVE_INLINE_FLSL use Obtained from: OpenZFS OpenZFS commit: 89f729dcca87425aadfa03d1764e96f285eb658d .../.github/workflows/scripts/qemu-4-build-vm.sh | 2 +- .../.github/workflows/scripts/qemu-test-repo-vm.sh | 18 +- sys/contrib/openzfs/.github/workflows/smatch.yml | 52 + .../.github/workflows/zfs-qemu-packages.yml | 2 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 23 +- sys/contrib/openzfs/cmd/raidz_test/raidz_test.h | 2 +- sys/contrib/openzfs/cmd/zed/Makefile.am | 3 +- sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c | 77 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 14 +- sys/contrib/openzfs/cmd/zfs/Makefile.am | 3 +- sys/contrib/openzfs/cmd/zfs/zfs_iter.c | 56 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 382 +-- sys/contrib/openzfs/cmd/zpool/Makefile.am | 1 - sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 80 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 104 +- sys/contrib/openzfs/cmd/ztest.c | 2 +- sys/contrib/openzfs/config/deb.am | 19 +- .../openzfs/config/kernel-kmap-atomic-args.m4 | 2 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 2 - sys/contrib/openzfs/contrib/debian/clean | 1 - sys/contrib/openzfs/contrib/debian/control | 24 +- .../openzfs/contrib/debian/openzfs-libuutil3.docs | 2 - .../contrib/debian/openzfs-libuutil3.install.in | 1 - .../openzfs/contrib/pam_zfs_key/Makefile.am | 1 - sys/contrib/openzfs/include/Makefile.am | 6 +- sys/contrib/openzfs/include/libuutil.h | 327 -- sys/contrib/openzfs/include/libuutil_common.h | 36 - sys/contrib/openzfs/include/libuutil_impl.h | 157 - .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 77 +- .../openzfs/include/os/freebsd/spl/sys/taskq.h | 2 +- .../openzfs/include/os/linux/spl/sys/taskq.h | 2 +- sys/contrib/openzfs/include/sys/ddt.h | 18 + sys/contrib/openzfs/include/thread_pool.h | 56 - sys/contrib/openzfs/lib/Makefile.am | 27 +- sys/contrib/openzfs/lib/libspl/include/sys/taskq.h | 4 +- sys/contrib/openzfs/lib/libspl/include/sys/types.h | 11 + sys/contrib/openzfs/lib/libspl/taskq.c | 19 +- sys/contrib/openzfs/lib/libspl/tunables.c | 12 +- sys/contrib/openzfs/lib/libtpool/Makefile.am | 11 - sys/contrib/openzfs/lib/libtpool/thread_pool.c | 612 ---- .../openzfs/lib/libtpool/thread_pool_impl.h | 94 - sys/contrib/openzfs/lib/libuutil/Makefile.am | 28 - sys/contrib/openzfs/lib/libuutil/libuutil.abi | 3360 -------------------- sys/contrib/openzfs/lib/libuutil/libuutil.suppr | 2 - sys/contrib/openzfs/lib/libuutil/uu_alloc.c | 136 - sys/contrib/openzfs/lib/libuutil/uu_avl.c | 569 ---- sys/contrib/openzfs/lib/libuutil/uu_ident.c | 123 - sys/contrib/openzfs/lib/libuutil/uu_list.c | 723 ----- sys/contrib/openzfs/lib/libuutil/uu_misc.c | 255 -- sys/contrib/openzfs/lib/libuutil/uu_string.c | 55 - sys/contrib/openzfs/lib/libzfs/Makefile.am | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 1236 +++---- sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 129 +- sys/contrib/openzfs/lib/libzfs/libzfs_config.c | 71 +- sys/contrib/openzfs/lib/libzfs/libzfs_impl.h | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 21 +- .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 1 - .../openzfs/lib/libzfs_core/libzfs_core.abi | 16 +- sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 - .../lib/libzutil/os/freebsd/zutil_import_os.c | 1 - .../lib/libzutil/os/linux/zutil_import_os.c | 1 - sys/contrib/openzfs/lib/libzutil/zutil_import.c | 13 +- sys/contrib/openzfs/module/Kbuild.in | 2 +- .../openzfs/module/os/freebsd/spl/spl_taskq.c | 13 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 2 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 58 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 50 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 3 +- sys/contrib/openzfs/module/zfs/ddt.c | 94 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 3 +- sys/contrib/openzfs/module/zfs/spa.c | 6 +- sys/contrib/openzfs/module/zfs/zfs_chksum.c | 24 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 3 +- sys/contrib/openzfs/module/zfs/zio.c | 126 +- sys/contrib/openzfs/rpm/generic/zfs.spec.in | 29 - .../events/slow_vdev_degraded_sit_out.ksh | 26 +- .../tests/functional/raidz/raidz_001_neg.ksh | 2 +- sys/contrib/openzfs/udev/zvol_id.c | 2 +- 78 files changed, 1244 insertions(+), 8291 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/smatch.yml index 000000000000,ac6454244f93..ac6454244f93 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/smatch.yml +++ b/sys/contrib/openzfs/.github/workflows/smatch.yml
