git: 160388166736 - main - zfs: merge openzfs/zfs at 75b4cbf62 (master) into main
Martin Matuska
mm at FreeBSD.org
Tue Jun 8 14:53:45 UTC 2021
The branch main has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=1603881667360c015f6685131f2f25474fa67a72
commit 1603881667360c015f6685131f2f25474fa67a72
Merge: ed9215c8e05f 75b4cbf62590
Author: Martin Matuska <mm at FreeBSD.org>
AuthorDate: 2021-06-08 14:48:37 +0000
Commit: Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-06-08 14:52:44 +0000
zfs: merge openzfs/zfs at 75b4cbf62 (master) into main
Notable upstream pull request merges:
#11710 Allow zfs to send replication streams with missing snapshots
#11751 Avoid taking global lock to destroy zfsdev state
#11786 Ratelimit deadman zevents as with delay zevents
#11803 ZFS traverse_visitbp optimization to limit prefetch
#11813 Allow pool names that look like Solaris disk names
#11822 Atomically check and set dropped zevent count
#11822 Don't scale zfs_zevent_len_max by CPU count
#11833 Refactor zfsdev state init/destroy to share common code
#11837 zfs get -p only outputs 3 columns if "clones" property is empty
#11843 libzutil: zfs_isnumber(): return false if input empty
#11849 Use dsl_scan_setup_check() to setup a scrub
#11861 Improvements to the 'compatibility' property
#11862 cmd/zfs receive: allow dry-run (-n) to check property args
#11864 receive: don't fail inheriting (-x) properties on wrong dataset type
#11877 Combine zio caches if possible
#11881 FreeBSD: use vnlru_free_vfsops if available
#11883 FreeBSD: add support for lockless symlink lookup
#11884 FreeBSD: add missing seqc write begin/end around zfs_acl_chown_setattr
#11896 Fix crash in zio_done error reporting
#11905 zfs-send(8): Restore sorting of flags
#11926 FreeBSD: damage control racing .. lookups in face of mkdir/rmdir
#11930 vdev_mirror: don't scrub/resilver devices that can't be read
#11938 Fix AVX512BW Fletcher code on AVX512-but-not-BW machines
#11955 zfs get: don't lookup mount options when using "-s local"
#11956 libzfs: add keylocation=https://, backed by fetch(3) or libcurl
#11959 vdev_id: variable not getting expanded under map_slot()
#11966 Scale worker threads and taskqs with number of CPUs
#11994 Clean up use of zfs_log_create in zfs_dir
#11997 FreeBSD: Don't force xattr mount option
#11997 FreeBSD: Implement xattr=sa
#11997 FreeBSD: Use SET_ERROR to trace xattr name errors
#11998 Simplify/fix dnode_move() for dn_zfetch
#12003 FreeBSD: Initialize/destroy zp->z_lock
#12010 Fix dRAID self-healing short columns
#12033 Revert "Fix raw sends on encrypted datasets when copying back snapshots"
#12040 Reinstate the old zpool read label logic as a fallback
#12046 Improve scrub maxinflight_bytes math
#12049 FreeBSD: avoid memory allocation in arc_prune_async
#12052 FreeBSD: incorporate changes to the VFS_QUOTACTL(9) KPI
#12061 Fix dRAID sequential resilver silent damage handling
#12072 Let zfs diff be more permissive
#12077 FreeBSD: Retry OCF ENOMEM errors.
#12088 Propagate vdev state due to invalid label corruption
#12091 libzfs: On FreeBSD, use MNT_NOWAIT with getfsstat
#12097 FreeBSD: Update dataset_kstats for zvols in dev mode
#12104 FreeBSD boot code reminder after zpool upgrade
#12114 Introduce write-mostly sums
Obtained from: OpenZFS
OpenZFS commit: 75b4cbf62590c23fac3667537961a2a75fdc2cc3
cddl/share/zfs/compatibility.d/Makefile | 4 +
.../openzfs/.github/ISSUE_TEMPLATE/config.yml | 2 +-
.../.github/workflows/zfs-tests-functional.yml | 8 +-
.../openzfs/.github/workflows/zfs-tests-sanity.yml | 8 +-
sys/contrib/openzfs/.gitmodules | 2 +-
sys/contrib/openzfs/META | 4 +-
sys/contrib/openzfs/Makefile.am | 54 +-
sys/contrib/openzfs/RELEASES.md | 37 +
sys/contrib/openzfs/cmd/Makefile.am | 8 +-
sys/contrib/openzfs/cmd/arc_summary/arc_summary2 | 97 +-
sys/contrib/openzfs/cmd/arc_summary/arc_summary3 | 50 +-
sys/contrib/openzfs/cmd/fsck_zfs/.gitignore | 1 +
sys/contrib/openzfs/cmd/fsck_zfs/Makefile.am | 5 +
sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs | 9 -
sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs.in | 44 +
sys/contrib/openzfs/cmd/mount_zfs/mount_zfs.c | 7 +-
sys/contrib/openzfs/cmd/raidz_test/raidz_test.c | 21 +-
sys/contrib/openzfs/cmd/vdev_id/Makefile.am | 2 +
sys/contrib/openzfs/cmd/vdev_id/vdev_id | 7 +-
sys/contrib/openzfs/cmd/zdb/zdb.c | 251 +-
sys/contrib/openzfs/cmd/zed/Makefile.am | 4 +-
sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c | 1 +
sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 1 +
sys/contrib/openzfs/cmd/zed/zed.c | 48 +-
sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 1 +
sys/contrib/openzfs/cmd/zed/zed.d/data-notify.sh | 2 +-
.../openzfs/cmd/zed/zed.d/generic-notify.sh | 2 +-
.../zed/zed.d/history_event-zfs-list-cacher.sh.in | 4 +-
.../openzfs/cmd/zed/zed.d/scrub_finish-notify.sh | 2 +-
.../openzfs/cmd/zed/zed.d/statechange-led.sh | 90 +-
.../openzfs/cmd/zed/zed.d/statechange-notify.sh | 2 +-
.../openzfs/cmd/zed/zed.d/trim_finish-notify.sh | 2 +-
sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh | 100 +-
sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 17 +
sys/contrib/openzfs/cmd/zed/zed.h | 17 +-
sys/contrib/openzfs/cmd/zed/zed_conf.c | 218 +-
sys/contrib/openzfs/cmd/zed/zed_conf.h | 38 +-
sys/contrib/openzfs/cmd/zed/zed_disk_event.c | 1 +
sys/contrib/openzfs/cmd/zed/zed_event.c | 82 +-
sys/contrib/openzfs/cmd/zed/zed_event.h | 2 +-
sys/contrib/openzfs/cmd/zed/zed_exec.c | 255 +-
sys/contrib/openzfs/cmd/zed/zed_exec.h | 8 +-
sys/contrib/openzfs/cmd/zed/zed_file.c | 120 +-
sys/contrib/openzfs/cmd/zed/zed_file.h | 8 +-
sys/contrib/openzfs/cmd/zed/zed_log.c | 2 +-
sys/contrib/openzfs/cmd/zed/zed_log.h | 2 +-
sys/contrib/openzfs/cmd/zed/zed_strings.c | 2 +-
sys/contrib/openzfs/cmd/zed/zed_strings.h | 2 +-
sys/contrib/openzfs/cmd/zfs/zfs_main.c | 49 +-
.../openzfs/cmd/zfs_ids_to_path/zfs_ids_to_path.c | 8 +-
sys/contrib/openzfs/cmd/zgenhostid/zgenhostid.c | 18 +-
sys/contrib/openzfs/cmd/zhack/zhack.c | 3 +-
sys/contrib/openzfs/cmd/zpool/Makefile.am | 5 +
.../cmd/zpool/compatibility.d/openzfs-2.1-freebsd | 34 +
.../cmd/zpool/compatibility.d/openzfs-2.1-linux | 35 +
.../openzfs/cmd/zpool/compatibility.d/zol-0.6.1 | 4 +
.../openzfs/cmd/zpool/compatibility.d/zol-0.6.4 | 10 +
.../openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c | 15 +
.../openzfs/cmd/zpool/os/linux/zpool_vdev_os.c | 5 +
sys/contrib/openzfs/cmd/zpool/zpool.d/smart | 15 +-
sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 15 +-
sys/contrib/openzfs/cmd/zpool/zpool_main.c | 259 +-
sys/contrib/openzfs/cmd/zpool/zpool_util.c | 16 +
sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 +
sys/contrib/openzfs/cmd/zpool/zpool_vdev.c | 2 +-
.../openzfs/cmd/zpool_influxdb/zpool_influxdb.c | 11 +-
sys/contrib/openzfs/cmd/zstream/Makefile.am | 3 +
sys/contrib/openzfs/cmd/zstream/zstream.c | 5 +
sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 1 -
sys/contrib/openzfs/cmd/zstreamdump/Makefile.am | 1 -
sys/contrib/openzfs/cmd/zstreamdump/zstreamdump | 3 -
sys/contrib/openzfs/cmd/ztest/ztest.c | 275 +-
sys/contrib/openzfs/cmd/zvol_wait/Makefile.am | 2 +
sys/contrib/openzfs/cmd/zvol_wait/zvol_wait | 43 +-
sys/contrib/openzfs/config/Abigail.am | 2 +-
sys/contrib/openzfs/config/CppCheck.am | 2 +-
sys/contrib/openzfs/config/Rules.am | 1 +
sys/contrib/openzfs/config/Shellcheck.am | 22 +
sys/contrib/openzfs/config/Substfiles.am | 4 +-
sys/contrib/openzfs/config/always-shellcheck.m4 | 10 +
sys/contrib/openzfs/config/ax_python_devel.m4 | 3 +-
sys/contrib/openzfs/config/deb.am | 22 +-
sys/contrib/openzfs/config/kernel-acl.m4 | 25 +-
sys/contrib/openzfs/config/kernel-bdi.m4 | 4 +-
sys/contrib/openzfs/config/kernel-blk-queue.m4 | 8 +-
.../config/kernel-block-device-operations.m4 | 32 +
.../openzfs/config/kernel-generic_fillattr.m4 | 2 +-
.../openzfs/config/kernel-is_owner_or_cap.m4 | 4 +
sys/contrib/openzfs/config/kernel-percpu.m4 | 27 +
sys/contrib/openzfs/config/kernel-rename.m4 | 1 +
sys/contrib/openzfs/config/kernel-siginfo.m4 | 21 +
sys/contrib/openzfs/config/kernel-signal-stop.m4 | 21 +
sys/contrib/openzfs/config/kernel-special-state.m4 | 21 +
sys/contrib/openzfs/config/kernel-tmpfile.m4 | 28 +-
sys/contrib/openzfs/config/kernel.m4 | 6 +
sys/contrib/openzfs/config/user-libatomic.m4 | 34 +
sys/contrib/openzfs/config/user-libfetch.m4 | 71 +
sys/contrib/openzfs/config/user.m4 | 2 +
sys/contrib/openzfs/config/zfs-build.m4 | 24 +
sys/contrib/openzfs/configure.ac | 2 +-
sys/contrib/openzfs/contrib/Makefile.am | 4 +
.../openzfs/contrib/bash_completion.d/.gitignore | 1 +
.../openzfs/contrib/bash_completion.d/Makefile.am | 10 +-
.../contrib/bash_completion.d/{zfs => zfs.in} | 87 +-
sys/contrib/openzfs/contrib/bpftrace/Makefile.am | 4 +
sys/contrib/openzfs/contrib/bpftrace/zfs-trace.sh | 4 +-
.../dracut/02zfsexpandknowledge/Makefile.am | 1 +
.../dracut/02zfsexpandknowledge/module-setup.sh.in | 54 +-
.../openzfs/contrib/dracut/90zfs/Makefile.am | 4 +
.../contrib/dracut/90zfs/module-setup.sh.in | 23 +-
.../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in | 10 +-
.../openzfs/contrib/dracut/90zfs/parse-zfs.sh.in | 3 +-
.../contrib/dracut/90zfs/zfs-env-bootfs.service.in | 2 +-
.../contrib/dracut/90zfs/zfs-generator.sh.in | 79 +-
.../openzfs/contrib/dracut/90zfs/zfs-lib.sh.in | 57 +-
.../contrib/dracut/90zfs/zfs-load-key.sh.in | 45 +-
.../dracut/90zfs/zfs-rollback-bootfs.service.in | 2 +-
.../dracut/90zfs/zfs-snapshot-bootfs.service.in | 2 +-
sys/contrib/openzfs/contrib/dracut/Makefile.am | 3 +
sys/contrib/openzfs/contrib/initramfs/Makefile.am | 3 +
.../openzfs/contrib/initramfs/hooks/Makefile.am | 1 +
sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in | 132 +-
.../openzfs/contrib/initramfs/hooks/zfsunlock.in | 16 +-
.../openzfs/contrib/initramfs/scripts/Makefile.am | 7 +-
.../initramfs/scripts/local-top/Makefile.am | 2 +
.../contrib/initramfs/scripts/local-top/zfs | 21 +-
sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 124 +-
.../pyzfs/libzfs_core/test/test_libzfs_core.py | 4 +-
sys/contrib/openzfs/copy-builtin | 45 +-
sys/contrib/openzfs/etc/Makefile.am | 4 +
sys/contrib/openzfs/etc/default/Makefile.am | 4 +
sys/contrib/openzfs/etc/init.d/Makefile.am | 3 +
sys/contrib/openzfs/etc/init.d/zfs-import.in | 26 +-
sys/contrib/openzfs/etc/init.d/zfs-mount.in | 49 +-
sys/contrib/openzfs/etc/init.d/zfs-share.in | 6 +-
sys/contrib/openzfs/etc/init.d/zfs-zed.in | 31 +-
sys/contrib/openzfs/etc/systemd/Makefile.am | 3 +
.../etc/systemd/system-generators/Makefile.am | 14 +-
.../system-generators/zfs-mount-generator.c | 1083 ++
.../system-generators/zfs-mount-generator.in | 473 -
sys/contrib/openzfs/etc/zfs/Makefile.am | 3 +
sys/contrib/openzfs/etc/zfs/zfs-functions.in | 99 +-
sys/contrib/openzfs/include/Makefile.am | 1 -
sys/contrib/openzfs/include/cityhash.h | 4 +-
sys/contrib/openzfs/include/libuutil.h | 28 -
sys/contrib/openzfs/include/libuutil_impl.h | 6 -
sys/contrib/openzfs/include/libzfs.h | 520 +-
sys/contrib/openzfs/include/libzutil.h | 71 +-
.../openzfs/include/os/freebsd/spl/sys/Makefile.am | 2 +-
.../openzfs/include/os/freebsd/spl/sys/console.h | 35 -
.../openzfs/include/os/freebsd/spl/sys/vfs.h | 2 -
.../openzfs/include/os/freebsd/spl/sys/vnode.h | 5 -
.../include/os/freebsd/spl/sys/vnode_impl.h | 2 +-
.../openzfs/include/os/freebsd/spl/sys/wmsum.h | 72 +
.../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 1 -
.../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 4 +-
.../include/os/linux/kernel/linux/blkdev_compat.h | 22 +-
.../include/os/linux/kernel/linux/mod_compat.h | 2 +-
.../openzfs/include/os/linux/spl/sys/Makefile.am | 2 +-
.../openzfs/include/os/linux/spl/sys/atomic.h | 4 +
.../openzfs/include/os/linux/spl/sys/console.h | 30 -
.../openzfs/include/os/linux/spl/sys/signal.h | 18 +-
.../openzfs/include/os/linux/spl/sys/thread.h | 13 +
.../openzfs/include/os/linux/spl/sys/wmsum.h | 76 +
.../include/os/linux/zfs/sys/zfs_vfsops_os.h | 1 -
sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 5 +
sys/contrib/openzfs/include/sys/aggsum.h | 7 +-
sys/contrib/openzfs/include/sys/dataset_kstats.h | 20 +-
sys/contrib/openzfs/include/sys/dsl_scan.h | 1 +
sys/contrib/openzfs/include/sys/fm/util.h | 1 -
sys/contrib/openzfs/include/sys/fs/zfs.h | 104 +-
sys/contrib/openzfs/include/sys/spa.h | 21 -
sys/contrib/openzfs/include/sys/vdev_draid.h | 2 +-
sys/contrib/openzfs/include/sys/vdev_impl.h | 5 +-
sys/contrib/openzfs/include/sys/vdev_raidz_impl.h | 3 +-
sys/contrib/openzfs/include/sys/vdev_rebuild.h | 2 +-
sys/contrib/openzfs/include/sys/zfs_context.h | 6 +-
sys/contrib/openzfs/include/sys/zfs_ioctl.h | 1 -
sys/contrib/openzfs/include/sys/zfs_ioctl_impl.h | 5 +
sys/contrib/openzfs/include/sys/zfs_sysfs.h | 4 +-
sys/contrib/openzfs/include/sys/zio.h | 17 -
sys/contrib/openzfs/include/sys/zio_checksum.h | 7 +-
sys/contrib/openzfs/include/zfeature_common.h | 17 +-
sys/contrib/openzfs/include/zfs_comutil.h | 17 +-
sys/contrib/openzfs/include/zfs_deleg.h | 10 +-
sys/contrib/openzfs/include/zfs_fletcher.h | 49 +-
sys/contrib/openzfs/include/zfs_namecheck.h | 28 +-
sys/contrib/openzfs/include/zfs_prop.h | 50 +-
sys/contrib/openzfs/lib/libefi/rdwr_efi.c | 13 +-
sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 4815 ++++----
sys/contrib/openzfs/lib/libnvpair/libnvpair_json.c | 15 +-
sys/contrib/openzfs/lib/libshare/Makefile.am | 1 +
sys/contrib/openzfs/lib/libshare/libshare.c | 1 -
sys/contrib/openzfs/lib/libshare/libshare_impl.h | 4 +
sys/contrib/openzfs/lib/libshare/nfs.c | 157 +
sys/contrib/openzfs/lib/libshare/nfs.h | 9 +
sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 170 +-
sys/contrib/openzfs/lib/libshare/os/linux/nfs.c | 166 +-
sys/contrib/openzfs/lib/libshare/os/linux/smb.c | 4 +-
sys/contrib/openzfs/lib/libspl/Makefile.am | 29 +-
.../openzfs/lib/libspl/asm-generic/.gitignore | 1 -
sys/contrib/openzfs/lib/libspl/asm-i386/atomic.S | 840 --
sys/contrib/openzfs/lib/libspl/asm-x86_64/atomic.S | 691 --
sys/contrib/openzfs/lib/libspl/assert.c | 4 +-
.../openzfs/lib/libspl/{asm-generic => }/atomic.c | 196 +-
.../{libuutil/uu_open.c => libspl/getexecname.c} | 61 +-
sys/contrib/openzfs/lib/libspl/include/assert.h | 2 +-
sys/contrib/openzfs/lib/libspl/include/atomic.h | 43 +
.../openzfs/lib/libspl/include/sys/Makefile.am | 1 +
sys/contrib/openzfs/lib/libspl/include/sys/wmsum.h | 68 +
sys/contrib/openzfs/lib/libspl/libspl_impl.h | 24 +
.../openzfs/lib/libspl/os/freebsd/getexecname.c | 49 +-
sys/contrib/openzfs/lib/libspl/os/freebsd/mnttab.c | 4 +-
.../openzfs/lib/libspl/os/linux/getexecname.c | 37 +-
.../openzfs/lib/libspl/os/linux/gethostid.c | 41 +-
.../openzfs/lib/libspl/os/linux/getmntany.c | 9 +-
sys/contrib/openzfs/lib/libspl/page.c | 2 +-
sys/contrib/openzfs/lib/libuutil/Makefile.am | 2 -
sys/contrib/openzfs/lib/libuutil/libuutil.abi | 2952 +++--
sys/contrib/openzfs/lib/libuutil/uu_dprintf.c | 130 -
sys/contrib/openzfs/lib/libuutil/uu_misc.c | 27 -
sys/contrib/openzfs/lib/libzfs/Makefile.am | 6 +-
sys/contrib/openzfs/lib/libzfs/libzfs.abi | 11230 +++++++++++--------
sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c | 2 +-
sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 200 +-
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 60 +-
sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 50 +-
.../openzfs/{include => lib/libzfs}/libzfs_impl.h | 108 +-
sys/contrib/openzfs/lib/libzfs/libzfs_import.c | 2 +-
sys/contrib/openzfs/lib/libzfs/libzfs_iter.c | 2 +-
sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 53 +-
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 304 +-
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 169 +-
sys/contrib/openzfs/lib/libzfs/libzfs_status.c | 28 +-
sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 80 +-
.../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 63 +-
.../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 7 +-
.../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c | 2 +-
.../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 12 +-
.../lib/libzfs/os/linux/libzfs_sendrecv_os.c | 4 +-
.../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 6 +-
.../openzfs/lib/libzfs_core/libzfs_core.abi | 5638 ++++++----
sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c | 12 +-
.../openzfs/lib/libzfsbootenv/lzbe_device.c | 9 +-
sys/contrib/openzfs/lib/libzpool/Makefile.am | 2 +-
sys/contrib/openzfs/lib/libzpool/kernel.c | 8 +-
sys/contrib/openzfs/lib/libzpool/util.c | 2 +-
.../lib/libzutil/os/freebsd/zutil_import_os.c | 2 +-
.../lib/libzutil/os/linux/zutil_device_path_os.c | 30 +-
.../lib/libzutil/os/linux/zutil_import_os.c | 15 +-
.../openzfs/lib/libzutil/zutil_device_path.c | 38 +-
sys/contrib/openzfs/lib/libzutil/zutil_import.c | 116 +-
sys/contrib/openzfs/lib/libzutil/zutil_nicenum.c | 3 +
sys/contrib/openzfs/man/man1/arcstat.1 | 650 +-
sys/contrib/openzfs/man/man1/cstyle.1 | 258 +-
sys/contrib/openzfs/man/man1/raidz_test.1 | 153 +-
sys/contrib/openzfs/man/man1/zhack.1 | 162 +-
sys/contrib/openzfs/man/man1/ztest.1 | 327 +-
sys/contrib/openzfs/man/man1/zvol_wait.1 | 37 +-
.../openzfs/man/man5/spl-module-parameters.5 | 464 +-
sys/contrib/openzfs/man/man5/vdev_id.conf.5 | 423 +-
sys/contrib/openzfs/man/man5/zfs-events.5 | 1069 +-
.../openzfs/man/man5/zfs-module-parameters.5 | 6038 ++++------
sys/contrib/openzfs/man/man5/zpool-features.5 | 1700 ++-
sys/contrib/openzfs/man/man8/fsck.zfs.8 | 96 +-
sys/contrib/openzfs/man/man8/mount.zfs.8 | 182 +-
sys/contrib/openzfs/man/man8/vdev_id.8 | 154 +-
sys/contrib/openzfs/man/man8/zdb.8 | 126 +-
sys/contrib/openzfs/man/man8/zed.8.in | 409 +-
sys/contrib/openzfs/man/man8/zfs-allow.8 | 201 +-
sys/contrib/openzfs/man/man8/zfs-bookmark.8 | 24 +-
sys/contrib/openzfs/man/man8/zfs-clone.8 | 27 +-
sys/contrib/openzfs/man/man8/zfs-create.8 | 25 +-
sys/contrib/openzfs/man/man8/zfs-destroy.8 | 20 +-
sys/contrib/openzfs/man/man8/zfs-diff.8 | 63 +-
sys/contrib/openzfs/man/man8/zfs-hold.8 | 24 +-
sys/contrib/openzfs/man/man8/zfs-jail.8 | 108 +-
sys/contrib/openzfs/man/man8/zfs-list.8 | 48 +-
sys/contrib/openzfs/man/man8/zfs-load-key.8 | 176 +-
.../openzfs/man/man8/zfs-mount-generator.8.in | 388 +-
sys/contrib/openzfs/man/man8/zfs-mount.8 | 30 +-
sys/contrib/openzfs/man/man8/zfs-program.8 | 415 +-
sys/contrib/openzfs/man/man8/zfs-project.8 | 98 +-
sys/contrib/openzfs/man/man8/zfs-promote.8 | 29 +-
sys/contrib/openzfs/man/man8/zfs-receive.8 | 123 +-
sys/contrib/openzfs/man/man8/zfs-rename.8 | 5 +-
sys/contrib/openzfs/man/man8/zfs-rollback.8 | 18 +-
sys/contrib/openzfs/man/man8/zfs-send.8 | 286 +-
sys/contrib/openzfs/man/man8/zfs-set.8 | 86 +-
sys/contrib/openzfs/man/man8/zfs-share.8 | 14 +-
sys/contrib/openzfs/man/man8/zfs-snapshot.8 | 27 +-
sys/contrib/openzfs/man/man8/zfs-upgrade.8 | 29 +-
sys/contrib/openzfs/man/man8/zfs-userspace.8 | 80 +-
sys/contrib/openzfs/man/man8/zfs-wait.8 | 30 +-
sys/contrib/openzfs/man/man8/zfs.8 | 482 +-
sys/contrib/openzfs/man/man8/zfs_ids_to_path.8 | 25 +-
sys/contrib/openzfs/man/man8/zfsconcepts.8 | 64 +-
sys/contrib/openzfs/man/man8/zfsprops.8 | 740 +-
sys/contrib/openzfs/man/man8/zgenhostid.8 | 23 +-
sys/contrib/openzfs/man/man8/zinject.8 | 378 +-
sys/contrib/openzfs/man/man8/zpool-add.8 | 47 +-
sys/contrib/openzfs/man/man8/zpool-attach.8 | 25 +-
sys/contrib/openzfs/man/man8/zpool-checkpoint.8 | 40 +-
sys/contrib/openzfs/man/man8/zpool-clear.8 | 24 +-
sys/contrib/openzfs/man/man8/zpool-create.8 | 136 +-
sys/contrib/openzfs/man/man8/zpool-destroy.8 | 17 +-
sys/contrib/openzfs/man/man8/zpool-detach.8 | 21 +-
sys/contrib/openzfs/man/man8/zpool-events.8 | 38 +-
sys/contrib/openzfs/man/man8/zpool-export.8 | 23 +-
sys/contrib/openzfs/man/man8/zpool-get.8 | 50 +-
sys/contrib/openzfs/man/man8/zpool-history.8 | 16 +-
sys/contrib/openzfs/man/man8/zpool-import.8 | 119 +-
sys/contrib/openzfs/man/man8/zpool-initialize.8 | 28 +-
sys/contrib/openzfs/man/man8/zpool-iostat.8 | 236 +-
sys/contrib/openzfs/man/man8/zpool-labelclear.8 | 16 +-
sys/contrib/openzfs/man/man8/zpool-list.8 | 43 +-
sys/contrib/openzfs/man/man8/zpool-offline.8 | 29 +-
sys/contrib/openzfs/man/man8/zpool-reguid.8 | 15 +-
sys/contrib/openzfs/man/man8/zpool-remove.8 | 18 +-
sys/contrib/openzfs/man/man8/zpool-reopen.8 | 27 +-
sys/contrib/openzfs/man/man8/zpool-replace.8 | 44 +-
sys/contrib/openzfs/man/man8/zpool-resilver.8 | 27 +-
sys/contrib/openzfs/man/man8/zpool-scrub.8 | 31 +-
sys/contrib/openzfs/man/man8/zpool-split.8 | 52 +-
sys/contrib/openzfs/man/man8/zpool-status.8 | 52 +-
sys/contrib/openzfs/man/man8/zpool-sync.8 | 30 +-
sys/contrib/openzfs/man/man8/zpool-trim.8 | 47 +-
sys/contrib/openzfs/man/man8/zpool-upgrade.8 | 43 +-
sys/contrib/openzfs/man/man8/zpool-wait.8 | 54 +-
sys/contrib/openzfs/man/man8/zpool.8 | 366 +-
sys/contrib/openzfs/man/man8/zpool_influxdb.8 | 141 +-
sys/contrib/openzfs/man/man8/zpoolconcepts.8 | 275 +-
sys/contrib/openzfs/man/man8/zpoolprops.8 | 124 +-
sys/contrib/openzfs/man/man8/zstream.8 | 29 +-
sys/contrib/openzfs/man/man8/zstreamdump.8 | 59 +-
sys/contrib/openzfs/module/avl/avl.c | 2 +-
sys/contrib/openzfs/module/icp/Makefile.in | 7 +-
sys/contrib/openzfs/module/icp/algs/edonr/edonr.c | 2 +-
sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 4 +-
.../module/icp/asm-x86_64/sha1/sha1-x86_64.S | 24 +-
.../module/icp/asm-x86_64/sha2/sha256_impl.S | 26 +
.../module/icp/asm-x86_64/sha2/sha512_impl.S | 26 +
.../openzfs/module/os/freebsd/spl/acl_common.c | 6 +-
sys/contrib/openzfs/module/os/freebsd/spl/callb.c | 16 +-
sys/contrib/openzfs/module/os/freebsd/spl/list.c | 17 +-
.../openzfs/module/os/freebsd/spl/spl_kmem.c | 6 +-
.../openzfs/module/os/freebsd/spl/spl_kstat.c | 14 +-
.../openzfs/module/os/freebsd/spl/spl_string.c | 2 +-
.../openzfs/module/os/freebsd/spl/spl_sysevent.c | 2 +-
.../openzfs/module/os/freebsd/spl/spl_uio.c | 4 +-
.../openzfs/module/os/freebsd/spl/spl_vfs.c | 6 +-
sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 5 +-
sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 16 +-
.../openzfs/module/os/freebsd/zfs/crypto_os.c | 8 +-
sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 45 +-
.../openzfs/module/os/freebsd/zfs/kmod_core.c | 64 +-
sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.c | 83 +-
.../openzfs/module/os/freebsd/zfs/vdev_file.c | 7 +-
.../openzfs/module/os/freebsd/zfs/vdev_geom.c | 20 +-
.../openzfs/module/os/freebsd/zfs/vdev_label_os.c | 2 +-
.../openzfs/module/os/freebsd/zfs/zfs_acl.c | 73 +-
.../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 22 +-
.../openzfs/module/os/freebsd/zfs/zfs_debug.c | 5 +-
.../openzfs/module/os/freebsd/zfs/zfs_dir.c | 27 +-
.../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 4 +-
.../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 17 +
.../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 44 +-
.../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 606 +-
.../openzfs/module/os/freebsd/zfs/zfs_znode.c | 117 +-
.../openzfs/module/os/freebsd/zfs/zio_crypt.c | 19 +-
.../openzfs/module/os/freebsd/zfs/zvol_os.c | 14 +-
.../openzfs/module/os/linux/spl/spl-generic.c | 4 +-
.../openzfs/module/os/linux/spl/spl-kmem-cache.c | 11 +-
sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 14 +
sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 105 +-
.../openzfs/module/os/linux/spl/spl-thread.c | 51 +
sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c | 4 +-
.../openzfs/module/os/linux/zfs/zfs_file_os.c | 4 +-
.../openzfs/module/os/linux/zfs/zfs_ioctl_os.c | 87 +-
.../openzfs/module/os/linux/zfs/zfs_vfsops.c | 8 -
.../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 34 +-
.../openzfs/module/os/linux/zfs/zfs_znode.c | 8 +-
.../openzfs/module/os/linux/zfs/zio_crypt.c | 17 +-
.../openzfs/module/os/linux/zfs/zpl_export.c | 12 +-
sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 5 +-
.../openzfs/module/os/linux/zfs/zpl_inode.c | 41 +-
.../openzfs/module/os/linux/zfs/zpl_xattr.c | 39 +-
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 2 +
sys/contrib/openzfs/module/unicode/u8_textprep.c | 2 +-
sys/contrib/openzfs/module/zcommon/zfs_comutil.c | 2 +-
.../openzfs/module/zcommon/zfs_fletcher_avx512.c | 8 +-
sys/contrib/openzfs/module/zcommon/zfs_namecheck.c | 6 -
sys/contrib/openzfs/module/zcommon/zfs_prop.c | 6 +-
sys/contrib/openzfs/module/zfs/abd.c | 2 +-
sys/contrib/openzfs/module/zfs/aggsum.c | 125 +-
sys/contrib/openzfs/module/zfs/arc.c | 84 +-
sys/contrib/openzfs/module/zfs/dataset_kstats.c | 48 +-
sys/contrib/openzfs/module/zfs/dbuf.c | 2 -
sys/contrib/openzfs/module/zfs/dmu_recv.c | 4 +-
sys/contrib/openzfs/module/zfs/dmu_traverse.c | 67 +-
sys/contrib/openzfs/module/zfs/dnode.c | 8 +-
sys/contrib/openzfs/module/zfs/dsl_bookmark.c | 6 +-
sys/contrib/openzfs/module/zfs/dsl_crypt.c | 11 +-
sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 65 +-
sys/contrib/openzfs/module/zfs/dsl_scan.c | 42 +-
sys/contrib/openzfs/module/zfs/fm.c | 321 +-
sys/contrib/openzfs/module/zfs/spa.c | 92 +-
sys/contrib/openzfs/module/zfs/spa_log_spacemap.c | 2 +-
sys/contrib/openzfs/module/zfs/vdev.c | 14 +-
sys/contrib/openzfs/module/zfs/vdev_draid.c | 49 +-
sys/contrib/openzfs/module/zfs/vdev_indirect.c | 12 +-
sys/contrib/openzfs/module/zfs/vdev_mirror.c | 9 +
sys/contrib/openzfs/module/zfs/vdev_raidz.c | 11 +-
sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 6 +-
sys/contrib/openzfs/module/zfs/vdev_removal.c | 4 -
sys/contrib/openzfs/module/zfs/zfs_fm.c | 8 +-
sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 120 +-
sys/contrib/openzfs/module/zfs/zio.c | 32 +-
sys/contrib/openzfs/module/zfs/zvol.c | 4 -
sys/contrib/openzfs/module/zstd/README.md | 2 +-
.../module/zstd/include/zstd_compat_wrapper.h | 2 +-
sys/contrib/openzfs/module/zstd/zfs_zstd.c | 4 +-
sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 2 +-
sys/contrib/openzfs/rpm/generic/zfs.spec.in | 64 +-
sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in | 5 +-
sys/contrib/openzfs/scripts/Makefile.am | 17 +-
sys/contrib/openzfs/scripts/commitcheck.sh | 4 +-
sys/contrib/openzfs/scripts/dkms.mkconf | 12 +-
sys/contrib/openzfs/scripts/dkms.postbuild | 7 +-
sys/contrib/openzfs/scripts/kmodtool | 30 +-
sys/contrib/openzfs/scripts/make_gitrev.sh | 4 +-
sys/contrib/openzfs/scripts/mancheck.sh | 43 +
sys/contrib/openzfs/scripts/paxcheck.sh | 3 +-
sys/contrib/openzfs/scripts/zfs-tests.sh | 1 -
sys/contrib/openzfs/scripts/zfs.sh | 4 +-
sys/contrib/openzfs/scripts/zimport.sh | 23 +-
sys/contrib/openzfs/scripts/zloop.sh | 17 +-
sys/contrib/openzfs/tests/Makefile.am | 5 +
sys/contrib/openzfs/tests/runfiles/common.run | 29 +-
sys/contrib/openzfs/tests/runfiles/linux.run | 8 +-
sys/contrib/openzfs/tests/runfiles/sanity.run | 5 +-
.../openzfs/tests/test-runner/bin/zts-report.py.in | 25 +-
.../openzfs/tests/test-runner/man/test-runner.1 | 598 +-
.../openzfs/tests/zfs-tests/cmd/draid/draid.c | 8 +-
.../tests/zfs-tests/cmd/file_check/file_check.c | 3 -
.../tests/zfs-tests/cmd/file_write/file_write.c | 2 +-
.../tests/zfs-tests/cmd/xattrtest/xattrtest.c | 2 +-
.../openzfs/tests/zfs-tests/include/libtest.shlib | 58 +-
.../openzfs/tests/zfs-tests/include/tunables.cfg | 1 +
.../tests/functional/atime/root_atime_off.ksh | 2 +-
.../tests/functional/atime/root_atime_on.ksh | 2 +-
.../tests/functional/atime/root_relatime_on.ksh | 2 +-
.../tests/functional/cli_root/zdb/zdb_checksum.ksh | 1 +
.../functional/cli_root/zdb/zdb_objset_id.ksh | 1 +
.../zfs_destroy/zfs_clone_livelist_dedup.ksh | 88 +
.../cli_root/zfs_destroy/zfs_destroy_015_pos.ksh | 2 +-
.../cli_root/zfs_get/zfs_get_001_pos.ksh | 12 +-
.../cli_root/zfs_get/zfs_get_common.kshlib | 10 +-
.../tests/functional/cli_root/zfs_load-key/HEXKEY | 1 +
.../functional/cli_root/zfs_load-key/Makefile.am | 6 +-
.../functional/cli_root/zfs_load-key/PASSPHRASE | 1 +
.../tests/functional/cli_root/zfs_load-key/RAWKEY | 1 +
.../functional/cli_root/zfs_load-key/cleanup.ksh | 2 +
.../functional/cli_root/zfs_load-key/setup.ksh | 5 +-
.../cli_root/zfs_load-key/zfs_load-key.cfg | 31 +
.../cli_root/zfs_load-key/zfs_load-key_all.ksh | 10 +
.../zfs_load-key/zfs_load-key_common.kshlib | 63 +
.../cli_root/zfs_load-key/zfs_load-key_https.ksh | 78 +
.../zfs_load-key/zfs_load-key_location.ksh | 5 +
.../zfs_load-key/zfs_load-key_recursive.ksh | 6 +
.../cli_root/zfs_mount/zfs_mount_test_race.ksh | 9 +-
.../zfs_receive/receive-o-x_props_override.ksh | 15 +-
.../tests/functional/cli_root/zfs_send/Makefile.am | 3 +-
.../cli_root/zfs_send/zfs_send_skip_missing.ksh | 77 +
.../cli_root/zfs_set/zfs_set_keylocation.ksh | 23 +-
.../cli_root/zpool_add/zpool_add_dryrun_output.ksh | 4 +-
.../zpool_events/zpool_events_duplicates.ksh | 3 +-
.../cli_user/misc/arc_summary_001_pos.ksh | 3 +
.../cli_user/zfs_list/zfs_list_002_pos.ksh | 2 +-
.../zpool_iostat/zpool_iostat_-c_homedir.ksh | 2 +-
.../zpool_iostat/zpool_iostat_-c_searchpath.ksh | 2 +-
.../zpool_status/zpool_status_-c_homedir.ksh | 2 +-
.../zpool_status/zpool_status_-c_searchpath.ksh | 2 +-
.../zfs-tests/tests/functional/deadman/Makefile.am | 1 +
.../tests/functional/deadman/deadman_ratelimit.ksh | 78 +
.../tests/functional/deadman/deadman_sync.ksh | 6 +-
.../zfs-tests/tests/functional/events/.gitignore | 1 +
.../zfs-tests/tests/functional/events/Makefile.am | 9 +-
.../zfs-tests/tests/functional/events/cleanup.ksh | 2 +-
.../tests/functional/events/events_002_pos.ksh | 4 +-
.../tests/functional/events/zed_fd_spill-zedlet.c | 36 +
.../tests/functional/events/zed_fd_spill.ksh | 77 +
.../tests/functional/events/zed_rc_filter.ksh | 1 +
.../functional/fault/auto_offline_001_pos.ksh | 4 +-
.../pool_checkpoint/checkpoint_big_rewind.ksh | 3 +-
.../pool_checkpoint/checkpoint_capacity.ksh | 7 +-
.../pool_checkpoint/checkpoint_discard_busy.ksh | 3 +-
.../pool_checkpoint/pool_checkpoint.kshlib | 9 +-
.../functional/pool_names/pool_names_002_neg.ksh | 8 +-
.../tests/functional/redundancy/Makefile.am | 2 +
.../tests/functional/redundancy/redundancy.kshlib | 24 +-
.../functional/redundancy/redundancy_draid.ksh | 248 +
.../functional/redundancy/redundancy_draid3.ksh | 2 +-
.../redundancy/redundancy_draid_damaged.ksh | 153 +
.../redundancy/redundancy_draid_spare1.ksh | 31 +-
.../redundancy/redundancy_draid_spare3.ksh | 46 +-
.../functional/redundancy/redundancy_raidz.ksh | 52 +-
.../functional/redundancy/redundancy_stripe.ksh | 4 +-
.../functional/removal/removal_condense_export.ksh | 2 +
.../functional/removal/removal_with_export.ksh | 2 +-
.../functional/replacement/attach_multiple.ksh | 6 +-
.../functional/replacement/replace_import.ksh | 2 +-
.../replacement/resilver_restart_001.ksh | 2 +-
.../functional/reservation/reservation_006_pos.ksh | 2 +-
.../functional/rsend/send_encrypted_files.ksh | 2 +-
.../zfs-tests/tests/functional/slog/cleanup.ksh | 4 -
.../zfs-tests/tests/functional/slog/setup.ksh | 4 -
.../tests/functional/userquota/Makefile.am | 3 +-
.../userquota/userspace_send_encrypted.ksh | 108 -
.../tests/functional/xattr/xattr_002_neg.ksh | 4 +-
.../zfs-tests/tests/perf/scripts/prefetch_io.sh | 42 +-
sys/contrib/openzfs/udev/rules.d/.gitignore | 5 +-
sys/modules/zfs/zfs_config.h | 6 +-
523 files changed, 31415 insertions(+), 28284 deletions(-)
diff --cc cddl/share/zfs/compatibility.d/Makefile
index 8bc18bcd6391,000000000000..255f4a3542b3
mode 100644,000000..100644
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@@ -1,49 -1,0 +1,53 @@@
+# $FreeBSD$
+
+ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
+
+.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
+
+FILES= \
+ compat-2018 \
+ compat-2019 \
+ compat-2020 \
+ compat-2021 \
+ freebsd-11.0 \
+ freebsd-11.2 \
+ freebsd-11.3 \
+ freenas-9.10.2 \
+ grub2 \
+ openzfsonosx-1.7.0 \
+ openzfsonosx-1.8.1 \
+ openzfsonosx-1.9.3 \
+ openzfs-2.0-freebsd \
+ openzfs-2.0-linux \
++ openzfs-2.1-freebsd \
++ openzfs-2.1-linux \
++ zol-0.6.1 \
++ zol-0.6.4 \
+ zol-0.6.5 \
+ zol-0.7 \
+ zol-0.8
+
+FILESDIR= ${SHAREDIR}/zfs/compatibility.d
+
+LINKS= \
+ ${FILESDIR}/compat-2018 ${FILESDIR}/2018 \
+ ${FILESDIR}/compat-2019 ${FILESDIR}/2019 \
+ ${FILESDIR}/compat-2020 ${FILESDIR}/2020 \
+ ${FILESDIR}/compat-2021 ${FILESDIR}/2021 \
+ ${FILESDIR}/freebsd-11.0 ${FILESDIR}/freebsd-11.1 \
+ ${FILESDIR}/freebsd-11.0 ${FILESDIR}/freenas-11.0 \
+ ${FILESDIR}/freebsd-11.2 ${FILESDIR}/freenas-11.2 \
+ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-11.4 \
+ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.0 \
+ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.1 \
+ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.2 \
+ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \
+ ${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \
+ ${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \
+ ${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \
+ ${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \
+ ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04
+
+LINKMODE= ${NOBINMODE}
+
+.include <bsd.prog.mk>
diff --cc sys/contrib/openzfs/RELEASES.md
index 000000000000,55bfdb80ef6e..55bfdb80ef6e
mode 000000,100644..100644
--- a/sys/contrib/openzfs/RELEASES.md
+++ b/sys/contrib/openzfs/RELEASES.md
diff --cc sys/contrib/openzfs/cmd/fsck_zfs/.gitignore
index 000000000000,0edf0309e94a..0edf0309e94a
mode 000000,100644..100644
--- a/sys/contrib/openzfs/cmd/fsck_zfs/.gitignore
+++ b/sys/contrib/openzfs/cmd/fsck_zfs/.gitignore
diff --cc sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs.in
index 000000000000,37096902cb94..37096902cb94
mode 000000,100755..100755
--- a/sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs.in
+++ b/sys/contrib/openzfs/cmd/fsck_zfs/fsck.zfs.in
diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-freebsd
index 000000000000,9fde997e8c60..9fde997e8c60
mode 000000,100644..100644
--- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-freebsd
+++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-freebsd
diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-linux
index 000000000000,c3ff176bf8f2..c3ff176bf8f2
mode 000000,100644..100644
--- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-linux
+++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/openzfs-2.1-linux
diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.1
index 000000000000,9bc963ddccab..9bc963ddccab
mode 000000,100644..100644
--- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.1
+++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.1
diff --cc sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.4
index 000000000000,82a2698c8c5c..82a2698c8c5c
mode 000000,100644..100644
--- a/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.4
+++ b/sys/contrib/openzfs/cmd/zpool/compatibility.d/zol-0.6.4
diff --cc sys/contrib/openzfs/config/Shellcheck.am
index 000000000000,6b805b797d12..6b805b797d12
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/Shellcheck.am
+++ b/sys/contrib/openzfs/config/Shellcheck.am
diff --cc sys/contrib/openzfs/config/always-shellcheck.m4
index 000000000000,2a9a099746f4..2a9a099746f4
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/always-shellcheck.m4
+++ b/sys/contrib/openzfs/config/always-shellcheck.m4
diff --cc sys/contrib/openzfs/config/kernel-siginfo.m4
index 000000000000,6ddb0dcc37d2..6ddb0dcc37d2
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-siginfo.m4
+++ b/sys/contrib/openzfs/config/kernel-siginfo.m4
diff --cc sys/contrib/openzfs/config/kernel-signal-stop.m4
index 000000000000,6cb86e7c4cde..6cb86e7c4cde
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-signal-stop.m4
+++ b/sys/contrib/openzfs/config/kernel-signal-stop.m4
diff --cc sys/contrib/openzfs/config/kernel-special-state.m4
index 000000000000,aa60aabebc43..aa60aabebc43
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-special-state.m4
+++ b/sys/contrib/openzfs/config/kernel-special-state.m4
diff --cc sys/contrib/openzfs/config/user-libatomic.m4
index 000000000000,14a60bbea9d0..14a60bbea9d0
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/user-libatomic.m4
+++ b/sys/contrib/openzfs/config/user-libatomic.m4
diff --cc sys/contrib/openzfs/config/user-libfetch.m4
index 000000000000,f5149fc1a5d7..f5149fc1a5d7
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/user-libfetch.m4
+++ b/sys/contrib/openzfs/config/user-libfetch.m4
diff --cc sys/contrib/openzfs/contrib/bash_completion.d/.gitignore
index 000000000000,0fd9cc63af2a..0fd9cc63af2a
mode 000000,100644..100644
--- a/sys/contrib/openzfs/contrib/bash_completion.d/.gitignore
+++ b/sys/contrib/openzfs/contrib/bash_completion.d/.gitignore
diff --cc sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.c
index 000000000000,b806339deb2f..b806339deb2f
mode 000000,100644..100644
--- a/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.c
+++ b/sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.c
diff --cc sys/contrib/openzfs/include/os/freebsd/spl/sys/wmsum.h
index 000000000000,9fdd1901b7ee..9fdd1901b7ee
mode 000000,100644..100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/wmsum.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/wmsum.h
diff --cc sys/contrib/openzfs/include/os/linux/spl/sys/wmsum.h
index 000000000000,0871bd69504c..0871bd69504c
mode 000000,100644..100644
--- a/sys/contrib/openzfs/include/os/linux/spl/sys/wmsum.h
+++ b/sys/contrib/openzfs/include/os/linux/spl/sys/wmsum.h
diff --cc sys/contrib/openzfs/lib/libshare/nfs.c
index 000000000000,44d3e93d42f0..44d3e93d42f0
mode 000000,100644..100644
--- a/sys/contrib/openzfs/lib/libshare/nfs.c
+++ b/sys/contrib/openzfs/lib/libshare/nfs.c
diff --cc sys/contrib/openzfs/lib/libspl/include/sys/wmsum.h
index 000000000000,0679af73ce91..0679af73ce91
mode 000000,100644..100644
--- a/sys/contrib/openzfs/lib/libspl/include/sys/wmsum.h
+++ b/sys/contrib/openzfs/lib/libspl/include/sys/wmsum.h
diff --cc sys/contrib/openzfs/lib/libspl/libspl_impl.h
index 000000000000,cda56e64c962..cda56e64c962
mode 000000,100644..100644
--- a/sys/contrib/openzfs/lib/libspl/libspl_impl.h
+++ b/sys/contrib/openzfs/lib/libspl/libspl_impl.h
diff --cc sys/contrib/openzfs/man/man8/zstreamdump.8
index f499be442a47,c6721daf11de..c6721daf11de
mode 100644,120000..120000
--- a/sys/contrib/openzfs/man/man8/zstreamdump.8
+++ b/sys/contrib/openzfs/man/man8/zstreamdump.8
diff --cc sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
index 0491b2ff3e28,6a59c0eae766..3eb5cd490d03
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
@@@ -1247,12 -1269,16 +1269,21 @@@ zfs_znode_free(znode_t *zp
list_remove(&zfsvfs->z_all_znodes, zp);
zfsvfs->z_nr_znodes--;
mutex_exit(&zfsvfs->z_znodes_lock);
+ symlink = atomic_load_ptr(&zp->z_cached_symlink);
+ if (symlink != NULL) {
+ atomic_store_rel_ptr((uintptr_t *)&zp->z_cached_symlink, (uintptr_t)NULL);
+ cache_symlink_free(symlink, strlen(symlink) + 1);
+ }
+ #if __FreeBSD_version >= 1300139
+ symlink = atomic_load_ptr(&zp->z_cached_symlink);
+ if (symlink != NULL) {
+ atomic_store_rel_ptr((uintptr_t *)&zp->z_cached_symlink,
+ (uintptr_t)NULL);
+ cache_symlink_free(symlink, strlen(symlink) + 1);
+ }
+ #endif
+
if (zp->z_acl_cached) {
zfs_acl_free(zp->z_acl_cached);
zp->z_acl_cached = NULL;
diff --cc sys/contrib/openzfs/scripts/mancheck.sh
index 000000000000,6ae1fc5becff..6ae1fc5becff
mode 000000,100755..100755
--- a/sys/contrib/openzfs/scripts/mancheck.sh
+++ b/sys/contrib/openzfs/scripts/mancheck.sh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh
index 000000000000,5f356967a457..5f356967a457
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_clone_livelist_dedup.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY
index 000000000000,95ed1c051a21..95ed1c051a21
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/HEXKEY
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE
index 000000000000,f3097ab13082..f3097ab13082
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/PASSPHRASE
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY
index 000000000000,f2d4cbf581ce..f2d4cbf581ce
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/RAWKEY
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh
index 000000000000,cac9c4140322..cac9c4140322
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_https.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh
index 000000000000,b367cef9c4a4..b367cef9c4a4
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh
index 000000000000,469117a56cc0..469117a56cc0
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/.gitignore
index 000000000000,ed5af03a1095..ed5af03a1095
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/.gitignore
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/.gitignore
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill-zedlet.c
index 000000000000,c072f906d23e..c072f906d23e
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill-zedlet.c
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill-zedlet.c
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh
index 000000000000,8736a7fdf7e6..8736a7fdf7e6
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/events/zed_fd_spill.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh
index 000000000000,8015e682c892..8015e682c892
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh
index 000000000000,6796cc78a1bd..6796cc78a1bd
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged.ksh
diff --cc sys/modules/zfs/zfs_config.h
index ebc9bbe9059b,000000000000..1400d9fe92c0
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,774 -1,0 +1,774 @@@
+/*
+ * $FreeBSD$
+ */
+
+/* zfs_config.h. Generated from zfs_config.h.in by configure. */
+/* zfs_config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+/* #undef ENABLE_NLS */
+
+/* bio_end_io_t wants 1 arg */
+/* #undef HAVE_1ARG_BIO_END_IO_T */
+
+/* lookup_bdev() wants 1 arg */
+/* #undef HAVE_1ARG_LOOKUP_BDEV */
+
+/* submit_bio() wants 1 arg */
+/* #undef HAVE_1ARG_SUBMIT_BIO */
+
+/* bdi_setup_and_register() wants 2 args */
+/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */
+
+/* vfs_getattr wants 2 args */
+/* #undef HAVE_2ARGS_VFS_GETATTR */
+
+/* zlib_deflate_workspacesize() wants 2 args */
+/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */
+
+/* bdi_setup_and_register() wants 3 args */
+/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */
+
+/* vfs_getattr wants 3 args */
+/* #undef HAVE_3ARGS_VFS_GETATTR */
+
+/* vfs_getattr wants 4 args */
+/* #undef HAVE_4ARGS_VFS_GETATTR */
+
+/* kernel has access_ok with 'type' parameter */
+/* #undef HAVE_ACCESS_OK_TYPE */
+
+/* posix_acl has refcount_t */
+/* #undef HAVE_ACL_REFCOUNT */
+
+/* Define if host toolchain supports AES */
+#define HAVE_AES 1
+
+#ifdef __amd64__
+#ifndef RESCUE
+/* Define if host toolchain supports AVX */
+#define HAVE_AVX 1
+#endif
+
+/* Define if host toolchain supports AVX2 */
+#define HAVE_AVX2 1
+
+/* Define if host toolchain supports AVX512BW */
+#define HAVE_AVX512BW 1
+
+/* Define if host toolchain supports AVX512CD */
+#define HAVE_AVX512CD 1
+
+/* Define if host toolchain supports AVX512DQ */
+#define HAVE_AVX512DQ 1
+
+/* Define if host toolchain supports AVX512ER */
+#define HAVE_AVX512ER 1
+
+/* Define if host toolchain supports AVX512F */
+#define HAVE_AVX512F 1
+
+/* Define if host toolchain supports AVX512IFMA */
+#define HAVE_AVX512IFMA 1
+
+/* Define if host toolchain supports AVX512PF */
+#define HAVE_AVX512PF 1
+
+/* Define if host toolchain supports AVX512VBMI */
+#define HAVE_AVX512VBMI 1
+
+/* Define if host toolchain supports AVX512VL */
+#define HAVE_AVX512VL 1
+#endif
+
+/* bdev_check_media_change() exists */
+/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
+
+/* bdev_whole() is available */
+/* #undef HAVE_BDEV_WHOLE */
+
+/* bio->bi_opf is defined */
+/* #undef HAVE_BIO_BI_OPF */
+
+/* bio->bi_status exists */
+/* #undef HAVE_BIO_BI_STATUS */
+
+/* bio has bi_iter */
+/* #undef HAVE_BIO_BVEC_ITER */
+
+/* bio_*_io_acct() available */
+/* #undef HAVE_BIO_IO_ACCT */
+
+/* bio_set_dev() is available */
+/* #undef HAVE_BIO_SET_DEV */
+
+/* bio_set_dev() GPL-only */
+/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
+
+/* bio_set_op_attrs is available */
+/* #undef HAVE_BIO_SET_OP_ATTRS */
+
+/* blkdev_reread_part() exists */
+/* #undef HAVE_BLKDEV_REREAD_PART */
+
+/* blkg_tryget() is available */
+/* #undef HAVE_BLKG_TRYGET */
+
+/* blkg_tryget() GPL-only */
+/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */
+
+/* blk_alloc_queue() expects request function */
+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */
+
+/* blk_alloc_queue_rh() expects request function */
+/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */
+
+/* blk queue backing_dev_info is dynamic */
+/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
+
+/* blk_queue_flag_clear() exists */
+/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */
*** 646 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list