Diffusion FreeBSD src repository ce7e1f86a181

15
ce7e1f86a181
Actions

Description

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

Details

Provenance

mm	Authored on Oct 25 2025, 8:14 AM

Parents

rG814f9afba7d6: Tag 2.4.0-rc3
rG16004d2a9eee: ice(4): Add PCI IDs for E835 devices

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGce7e1f86a181: zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15 (authored by mm).Oct 25 2025, 8:14 AM

Herald added a subscriber: MichalX.Gulbicki_intel.com. · View Herald TranscriptOct 25 2025, 8:41 AM

mm mentioned this in rG51d5e8c8ca0f: zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3).Oct 25 2025, 9:19 AM

cperciva mentioned this in rG6bf158defbcb: zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15.Tue, Oct 28, 9:23 PM

cperciva mentioned this in rGed0083d08115: zfs: update zfs_config.h and zfs_gitrev.h after ce7e1f86a (zfs-2.4.0-rc3).

Merged Changes

814f9afba7d6 Tag 2.4.0-rc3
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
6f6e1c90ae4b FreeBSD: zfs_getpages: Don't zero freshly allocated pages
Author
dumbbell
Browse Repository
No Builds
No Audits
aeff23939ae9 Linux 6.18: generic_drop_inode() and generic_delete_inode() renamed
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
7730109762f9 sha256_generic: make internal functions a little more private
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
2778832e22f1 Linux 6.18: namespace type moved to ns_common
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
005c631499ee Linux 6.18: replace write_cache_pages()
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
04d0f83f4efb Linux 6.18: block_device_operations->getgeo takes struct gendisk*
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
49f078997a1e Linux 6.18: convert ida_simple_* calls
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
3fb241157f64 Linux 6.18: replace nth_page()
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
799bda73e292 Fix return value for setting zvol threading
Author
walker.aj325_gmail.com
Browse Repository
No Builds
No Audits
b0106a1b7455 zdb: fix bug with -A flag
Author
Shreshth3 <66148173+Shreshth3@users.noreply.github.com>
Browse Repository
No Builds
No Audits
084f8d00778f Fix ZFS_READONLY implementation on Linux
Author
walker.aj325_gmail.com
Browse Repository
No Builds
No Audits
7987d4deb427 Update device removal documentation
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
1956417b5455 mmap_seek: print error code and text on failure
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
3378a324dfb2 CI: Fix FreeBSD 15.0 by staying on ALPHA4 due to broken ALPHA5 image
Author
Ameer Hamza <ahamza@ixsystems.com>
Browse Repository
No Builds
No Audits
f16fa115d1d1 arc: fix small typos
Author
Shreshth3 <66148173+Shreshth3@users.noreply.github.com>
Browse Repository
No Builds
No Audits
f0c76f8a7b37 libzpool/cmn_err: remove suppression, add stop option, cleanup
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
c1f55bff8b66 Fix the type of the raidz_outlier_check_interval_ms parameter
Author
markj
Browse Repository
No Builds
No Audits
f0bff230f91e Suppress some ashift warnings
Author
mav
Browse Repository
No Builds
No Audits
b9356f06ed55 Explicit set ashift for non-leaf vdevs
Author
mav
Browse Repository
No Builds
No Audits
30a3e609a217 zpool_reopen_004_pos: Clear label from offline disk after destroy
Author
Ameer Hamza <ahamza@ixsystems.com>
Browse Repository
No Builds
No Audits
964dfc317676 FreeBSD: Correct _PC_MIN_HOLE_SIZE
Author
des
Browse Repository
No Builds
No Audits
e4a393cf789f Add missing include statement
Author
Shreshth3 <66148173+Shreshth3@users.noreply.github.com>
Browse Repository
No Builds
No Audits
e09c86cb1f75 zvol: verify IO type is supported
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
6c73fd8eebec Annotate arc_buf_is_shared as __maybe_unused
Author
mjg
Browse Repository
No Builds
No Audits
9050ecb75c62 CI: Switch FreeBSD 15 to 15.0-ALPHA4 and add FreeBSD 16
Author
Tino Reichardt <milky-zfs@mcmilk.de>
Browse Repository
No Builds
No Audits
cf9163f25021 zdb: adjust block histogram binning strategy
Author
Ivan Shapovalov <intelfx@intelfx.name>
Browse Repository
No Builds
No Audits
250e2ec229ca zdb: factor out block histogram bin number computation
Author
Ivan Shapovalov <intelfx@intelfx.name>
Browse Repository
No Builds
No Audits
968cfc3df2b1 zdb: add `--class=(normal|special|...)` to filter blocks by alloc class
Author
Ivan Shapovalov <intelfx@intelfx.name>
Browse Repository
No Builds
No Audits
627b530059e0 zdb: add `--bin=(lsize|psize|asize)` arg to control histogram binning
Author
Ivan Shapovalov <intelfx@intelfx.name>
Browse Repository
No Builds
No Audits
6809137db5e6 zdb: convert `ALLOCATED_OPT` into anonymous enum
Author
Ivan Shapovalov <intelfx@intelfx.name>
Browse Repository
No Builds
No Audits
3e7e19e028fd pool_iter_refresh: don't refresh pools twice
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4c84b77bc4bb pool_iter_refresh: don't flag existing pools as refreshed
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
37d8d4619f1a zpool iostat: update pool counter when skipping boot row
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
1585a10a8522 Make mount/share errors non-fatal for zfs create/clone
Author
Ameer Hamza <ahamza@ixsystems.com>
Browse Repository
No Builds
No Audits
b9d1e28a71bd ddt prune: Add SCL_ZIO deadlock workaround
Author
igoro
Browse Repository
No Builds
No Audits
01180a63bd3a spa_config: Rename spa_config_enter_mmp() to spa_config_enter_priority()
Author
igoro
Browse Repository
No Builds
No Audits
ead0fb736dbe zinject: Introduce ready delay fault injection
Author
Robert Evans <evansr@google.com>
Browse Repository
No Builds
No Audits
073b34b3eefa Fix display of default xattr to show 'sa'
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
c0d63f5435d1 docs: fix a few small typos (#17804)
Author
Shreshth3 <66148173+Shreshth3@users.noreply.github.com>
Browse Repository
No Builds
No Audits

Changes (60)

Path

Size

sys/

contrib/

openzfs/

.github/

ISSUE_TEMPLATE/

feature_request.md

workflows/

scripts/

zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15ce7e1f86a181Actions

Description

Details

Event Timeline

Merged Changes

Changes (60)

rGce7e1f86a181

sys/contrib/openzfs/.github/ISSUE_TEMPLATE/feature_request.md

sys/contrib/openzfs/.github/workflows/scripts/qemu-2-start.sh

sys/contrib/openzfs/.github/workflows/zfs-qemu.yml

sys/contrib/openzfs/META

sys/contrib/openzfs/cmd/zdb/zdb.c

sys/contrib/openzfs/cmd/zfs/zfs_main.c

sys/contrib/openzfs/cmd/zinject/zinject.c

sys/contrib/openzfs/cmd/zpool/zpool_iter.c

sys/contrib/openzfs/cmd/zpool/zpool_main.c

sys/contrib/openzfs/cmd/zpool/zpool_vdev.c

sys/contrib/openzfs/config/kernel-block-device-operations.m4

sys/contrib/openzfs/config/kernel-drop-inode.m4

sys/contrib/openzfs/config/kernel-namespace.m4

sys/contrib/openzfs/config/kernel-userns-capabilities.m4

sys/contrib/openzfs/config/kernel-writeback.m4

sys/contrib/openzfs/config/kernel-writepage_t.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/contrib/intel_qat/readme.md

sys/contrib/openzfs/etc/init.d/README.md

sys/contrib/openzfs/include/libzfs.h

sys/contrib/openzfs/include/os/linux/kernel/linux/vfs_compat.h

sys/contrib/openzfs/include/sys/spa.h

sys/contrib/openzfs/include/sys/zfs_ioctl.h

sys/contrib/openzfs/include/sys/zio.h

sys/contrib/openzfs/lib/libspl/include/sys/uio.h

sys/contrib/openzfs/lib/libuutil/libuutil.abi

sys/contrib/openzfs/lib/libzfs/libzfs.abi

sys/contrib/openzfs/lib/libzfs/libzfs_config.c

sys/contrib/openzfs/lib/libzfs/libzfs_status.c

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi

sys/contrib/openzfs/lib/libzpool/kernel.c

sys/contrib/openzfs/man/man8/zdb.8

sys/contrib/openzfs/man/man8/zinject.8

sys/contrib/openzfs/man/man8/zpool-remove.8

sys/contrib/openzfs/module/icp/algs/sha2/sha2_generic.c

sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c

sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c

sys/contrib/openzfs/module/os/linux/spl/spl-zone.c

sys/contrib/openzfs/module/os/linux/zfs/abd_os.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c

sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_super.c

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

sys/contrib/openzfs/module/zcommon/zfs_prop.c

sys/contrib/openzfs/module/zfs/arc.c

sys/contrib/openzfs/module/zfs/mmp.c

sys/contrib/openzfs/module/zfs/spa_misc.c

sys/contrib/openzfs/module/zfs/vdev_removal.c

sys/contrib/openzfs/module/zfs/zio.c

sys/contrib/openzfs/module/zfs/zio_inject.c

sys/contrib/openzfs/module/zfs/zvol.c

sys/contrib/openzfs/tests/runfiles/common.run

sys/contrib/openzfs/tests/runfiles/sanity.run

sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c

sys/contrib/openzfs/tests/zfs-tests/tests/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen_004_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib

sys/contrib/openzfs/tests/zfs-tests/tests/functional/xattr/xattr_014_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh

zfs: merge openzfs/zfs@814f9afba (zfs-2.4-release) into stable/15
ce7e1f86a181
Actions