Paths

Table of Contentst

Diffusion FreeBSD src repository d0abb9a6399a

zfs: merge openzfs/zfs@1d0b94c4e
d0abb9a6399a
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@1d0b94c4e

Notable upstream pull request merges:
#17398 -multiple ZIL: "crash" the ZIL if the pool suspends during fallback
#17585 0c376d0f5 Document the new '-a' zpool option
#17590 03592417c SIMD: Don't require definition of HAVE_XSAVE
#17591 -multiple Prefer VERIFY0 over comparision with 0 or NULL
#17596 -multiple zvol: misc cleanups
#17605 2fd145b57 zvol: cleanup error handling and passthrough

Obtained from: OpenZFS
OpenZFS commit: 1d0b94c4e73d83299528c44fb4fa3b29eb6009a3

Details

Provenance

mm	Authored on Aug 12 2025, 1:20 PM

Parents

rG18a9f83630a7: bsd.man.mk: Add checkmanlinks target
rG1d0b94c4e73d: zed: prettify slack notification message

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGd0abb9a6399a: zfs: merge openzfs/zfs@1d0b94c4e (authored by mm).Aug 12 2025, 1:21 PM

Merged Changes

1d0b94c4e73d zed: prettify slack notification message
Author
René Wirnata <rene.wirnata@pandascience.net>
Browse Repository
No Builds
No Audits
2fd145b5786b zvol: cleanup error handling and passthrough
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
90a1e13df2a0 Linux: zfs_sync: remove explicit suspend check
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
ef4058fcdc01 FreeBSD: zfs_putpage: handle page writeback errors
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
3d6ee9a68c89 Linux: zfs_putpage: handle page writeback errors
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
391e85f51932 ZIL: add zil_commit_flags() to make honouring failmode= optional
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
72602f6ad9ab ZIL: "crash" the ZIL if the pool suspends during fallback
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
99a5f5d1ba02 ZIL: pass commit errors back to ITX callbacks
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
967b15b88820 ZIL: allow zil_commit() to fail with error
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
1f8c39ddb243 ZTS: test response of various sync methods under different failmodes
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
b270663e8a94 linux/zvol_os: fix crash with blk-mq on Linux 4.19
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
82d6f7b0471b Prefer VERIFY0P(n) over VERIFY3P(n, ==, NULL)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
f7bdd843289a Prefer VERIFY0P(n) over VERIFY(n == NULL)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
611b95da1860 Prefer VERIFY0(n) over VERIFY3S(n, ==, 0)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
5c7df3bcac6a Prefer VERIFY0(n) over VERIFY3U(n, ==, 0)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
c39e076f23b9 Prefer VERIFY0(n) over VERIFY(n == 0)
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
2564308cb251 rpm: don't list /sbin/zgenhostid twice in %files
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
e44e51f28daa zvol_task_report_status: gate behind ZFS_DEBUG
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
e6eb03a99153 zvol_check_volblocksize: fix spa ref leak
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
3e671f2353f9 zvol: remove void return casts on void-returning functions
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
0c376d0f59f3 Document the new '-a' zpool option
Author
oshogbo
Browse Repository
No Builds
No Audits
3e004369f743 Removed unused zio_decompress_fail_fraction variable
Author
Alek P <alek-p@users.noreply.github.com>
Browse Repository
No Builds
No Audits
25930cb8a1aa config: Avoid `void main()` in toolchain-simd.m4
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
03592417cbf4 SIMD: Don't require definition of `HAVE_XSAVE`
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits

Changes (150)

Path

Size

sys/

contrib/

openzfs/

cmd/

zdb/

zed/

zed.d/

zed-functions.sh

zfs/

zpool/

config/

toolchain-simd.m4

include/

os/

freebsd/

spl/

sys/

linux/

kernel/

linux/

spl/

sys/

sys/

lib/

libspl/

include/

sys/

libzfs/

libzfs_import.c

libzfs_sendrecv.c

libzpool/

libzutil/

module/

avl/

icp/

core/

io/

nvpair/

os/

freebsd/

spl/

zfs/

linux/

spl/

spl-kmem-cache.c

zfs/

zfs/

dataset_kstats.c

space_reftree.c

vdev_indirect.c

vdev_initialize.c

rpm/

generic/

tests/

runfiles/

zfs-tests/

cmd/

mmap_write_sync.c

include/

tests/

functional/

failmode/

failmode.kshlib

failmode_fsync_continue.ksh

failmode_fsync_wait.ksh

failmode_msync_continue.ksh

failmode_msync_wait.ksh

failmode_osync_continue.ksh

failmode_osync_wait.ksh

failmode_syncalways_continue.ksh

failmode_syncalways_wait.ksh

modules/

zfs/

rGd0abb9a6399a

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

Loading...

sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh

Loading...

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

Loading...

sys/contrib/openzfs/cmd/zhack.c

Loading...

sys/contrib/openzfs/cmd/zilstat.in

Loading...

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

Loading...

sys/contrib/openzfs/cmd/ztest.c

Loading...

sys/contrib/openzfs/config/toolchain-simd.m4

Loading...

sys/contrib/openzfs/include/os/freebsd/spl/sys/debug.h

Loading...

sys/contrib/openzfs/include/os/freebsd/spl/sys/proc.h

Loading...

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

Loading...

sys/contrib/openzfs/include/os/linux/spl/sys/debug.h

Loading...

sys/contrib/openzfs/include/os/linux/spl/sys/mutex.h

Loading...

sys/contrib/openzfs/include/sys/dmu.h

Loading...

sys/contrib/openzfs/include/sys/zfs_znode.h

Loading...

sys/contrib/openzfs/include/sys/zil.h

Loading...

sys/contrib/openzfs/include/sys/zil_impl.h

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/lib/libzutil/zutil_import.c

Loading...

sys/contrib/openzfs/module/avl/avl.c

Loading...

sys/contrib/openzfs/module/icp/core/kcf_sched.c

Loading...

sys/contrib/openzfs/module/icp/io/aes.c

Loading...

sys/contrib/openzfs/module/nvpair/nvpair.c

Loading...

sys/contrib/openzfs/module/os/freebsd/spl/spl_kmem.c

Loading...

sys/contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/module/os/linux/spl/spl-kmem-cache.c

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/rpm/generic/zfs.spec.in

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore

Loading...

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

Loading...

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

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/include/commands.cfg

Loading...

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

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode.kshlib

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_fsync_continue.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_fsync_wait.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_msync_continue.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_msync_wait.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_osync_continue.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_osync_wait.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_syncalways_continue.ksh

Loading...

sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_syncalways_wait.ksh

Loading...

sys/modules/zfs/zfs_config.h

Loading...

sys/modules/zfs/zfs_gitrev.h

Loading...