Date: Sat, 25 Oct 2025 08:41:19 GMT From: Martin Matuska <mm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ce7e1f86a181 - stable/15 - zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15 Message-ID: <202510250841.59P8fJua075479@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=ce7e1f86a1810038f142c5c68b787c47252b39c5 commit ce7e1f86a1810038f142c5c68b787c47252b39c5 Merge: 16004d2a9eee 814f9afba7d6 Author: Martin Matuska <mm@FreeBSD.org> AuthorDate: 2025-10-25 08:14:36 +0000 Commit: Martin Matuska <mm@FreeBSD.org> CommitDate: 2025-10-25 08:14:36 +0000 zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15 OpenZFS 2.4.0 rc3 Notable upstream pull request merges: #17750 964dfc317 FreeBSD: Correct _PC_MIN_HOLE_SIZE #17793 b9d1e28a7 ddt prune: Add SCL_ZIO deadlock workaround #17799 1585a10a8 Make mount/share errors non-fatal for zfs create/clone #17801 073b34b3e Fix display of default xattr to show 'sa' #17803 e09c86cb1 zvol: verify IO type is supported #17807 -multiple zpool iostat: fix regressions in "all pools" mode after #17786 #17826 b9356f06e Explicit set ashift for non-leaf vdevs #17830 f0bff230f Suppress some ashift warnings #17833 c1f55bff8 Fix the type of the raidz_outlier_check_interval_ms parameter #17836 799bda73e Fix return value for setting zvol threading #17834 f0c76f8a7 libzpool/cmn_err: remove suppression, add stop option, cleanup #17843 1956417b5 mmap_seek: print error code and text on failure #17847 7987d4deb Update device removal documentation #17851 6f6e1c90a FreeBSD: zfs_getpages: Don't zero freshly allocated pages Obtained from: OpenZFS OpenZFS commit: 814f9afba7d6714bd63f18ac808955b61d37f9f0 OpenZFS tag: zfs-2.4.0-rc3 .../.github/ISSUE_TEMPLATE/feature_request.md | 2 +- .../.github/workflows/scripts/qemu-2-start.sh | 11 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 2 +- sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 191 +++++++++++++++++++-- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 10 +- sys/contrib/openzfs/cmd/zinject/zinject.c | 81 +++++++-- sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 19 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 1 + sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 64 +++---- .../config/kernel-block-device-operations.m4 | 34 ++++ sys/contrib/openzfs/config/kernel-drop-inode.m4 | 24 +++ sys/contrib/openzfs/config/kernel-namespace.m4 | 31 ++++ .../openzfs/config/kernel-userns-capabilities.m4 | 79 --------- sys/contrib/openzfs/config/kernel-writeback.m4 | 58 +++++++ sys/contrib/openzfs/config/kernel-writepage_t.m4 | 26 --- sys/contrib/openzfs/config/kernel.m4 | 8 +- sys/contrib/openzfs/contrib/intel_qat/readme.md | 2 +- sys/contrib/openzfs/etc/init.d/README.md | 2 +- sys/contrib/openzfs/include/libzfs.h | 2 + .../include/os/linux/kernel/linux/vfs_compat.h | 7 + sys/contrib/openzfs/include/sys/spa.h | 2 +- sys/contrib/openzfs/include/sys/zfs_ioctl.h | 1 + sys/contrib/openzfs/include/sys/zio.h | 1 + sys/contrib/openzfs/lib/libspl/include/sys/uio.h | 1 + sys/contrib/openzfs/lib/libuutil/libuutil.abi | 105 +---------- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 172 ++++--------------- sys/contrib/openzfs/lib/libzfs/libzfs_config.c | 17 ++ sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 78 +++++---- .../openzfs/lib/libzfs_core/libzfs_core.abi | 105 +---------- sys/contrib/openzfs/lib/libzpool/kernel.c | 79 +++++++-- sys/contrib/openzfs/man/man8/zdb.8 | 14 ++ sys/contrib/openzfs/man/man8/zinject.8 | 14 ++ sys/contrib/openzfs/man/man8/zpool-remove.8 | 4 +- .../openzfs/module/icp/algs/sha2/sha2_generic.c | 41 +++-- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 3 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 31 +++- sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 19 +- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 9 + sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 5 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 74 ++++++++ .../openzfs/module/os/linux/zfs/zpl_super.c | 4 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 109 ++++++++---- sys/contrib/openzfs/module/zcommon/zfs_prop.c | 2 +- sys/contrib/openzfs/module/zfs/arc.c | 17 +- sys/contrib/openzfs/module/zfs/mmp.c | 2 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 8 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 80 ++++++--- sys/contrib/openzfs/module/zfs/zio.c | 35 +++- sys/contrib/openzfs/module/zfs/zio_inject.c | 38 ++++ sys/contrib/openzfs/module/zfs/zvol.c | 2 +- sys/contrib/openzfs/tests/runfiles/common.run | 3 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 2 +- .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 35 ++-- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../cli_root/zpool_reopen/zpool_reopen_004_pos.ksh | 2 + .../functional/delegate/delegate_common.kshlib | 6 +- .../tests/functional/xattr/xattr_014_pos.ksh | 53 ++++++ .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 7 + 60 files changed, 1133 insertions(+), 706 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-drop-inode.m4 index 000000000000,6f2b12cadc02..6f2b12cadc02 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-drop-inode.m4 +++ b/sys/contrib/openzfs/config/kernel-drop-inode.m4 diff --cc sys/contrib/openzfs/config/kernel-namespace.m4 index 000000000000,9b0b12e4eab4..9b0b12e4eab4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-namespace.m4 +++ b/sys/contrib/openzfs/config/kernel-namespace.m4 diff --cc sys/contrib/openzfs/config/kernel-writeback.m4 index 000000000000,334d65ef84b6..334d65ef84b6 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-writeback.m4 +++ b/sys/contrib/openzfs/config/kernel-writeback.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh index 000000000000,d4c9a0a41816..d4c9a0a41816 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.kshhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510250841.59P8fJua075479>