Diffusion FreeBSD src repository c6767dc1f236

zfs: merge openzfs/zfs@34205715e
c6767dc1f236
Actions

Description

zfs: merge openzfs/zfs@34205715e

Notable upstream pull request merges:
#16938 2aa3fbe76 zinject: count matches and injections for each handler
#16947 -multiple zinject: add "probe" device injection type
#16976 34205715e FreeBSD: Add setting of the VFCF_FILEREV flag

zfs: merge openzfs/zfs@34205715ec6767dc1f236Actions

Description

Details

Event Timeline

Merged Changes

Changes (53)

rGc6767dc1f236

sys/contrib/openzfs/RELEASES.md

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

sys/contrib/openzfs/include/sys/sa.h

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

sys/contrib/openzfs/man/man4/zfs.4

sys/contrib/openzfs/man/man7/vdevprops.7

sys/contrib/openzfs/man/man7/zpool-features.7

sys/contrib/openzfs/man/man8/zfs-destroy.8

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

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

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

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

sys/contrib/openzfs/module/Makefile.in

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

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

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

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

sys/contrib/openzfs/tests/zfs-tests/include/kstat.shlib

sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/arc/dbufstats_001_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cache/cache_012_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_counts.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zinject/zinject_probe.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/l2arc_compressed_arc.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/l2arc_compressed_arc_disabled.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/l2arc_encrypted.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/compression/l2arc_encrypted_no_compressed_arc.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/deadman/deadman_sync.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/direct/dio.kshlib

sys/contrib/openzfs/tests/zfs-tests/tests/functional/direct/dio_read_verify.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/direct/dio_unaligned_filesize.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/direct/dio_write_stable_pages.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/direct/dio_write_verify.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/fadvise/fadvise_sequential.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_on_probe_errors.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_resume_single.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/l2arc_arcstats_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/l2arc_l2miss_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/l2arc_mfuonly_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_001_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_002_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_003_neg.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_004_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_005_pos.ksh

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_write_distribution.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_write_slow_disk.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/mount/umount_unlinked_drain.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/trim/trim_l2arc.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h

zfs: merge openzfs/zfs@34205715e
c6767dc1f236
Actions