Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Jun 2021 15:03:59 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: 04c4bd7f7b52 - stable/13 - zfs: merge openzfs/zfs@7d9f3ef0e (zfs-2.1-release) into stable/13
Message-ID:  <202106081503.158F3xpo039340@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=04c4bd7f7b525b1627304894e3413693e945bc0d

commit 04c4bd7f7b525b1627304894e3413693e945bc0d
Merge: 84b8d2bc9ba8 7d9f3ef0ef5c
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-06-08 15:01:18 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2021-06-08 15:01:18 +0000

    zfs: merge openzfs/zfs@7d9f3ef0e (zfs-2.1-release) into stable/13
    
    Notable upstream pull request merges:
      #11710 Allow zfs to send replication streams with missing snapshots
      #11786 Ratelimit deadman zevents as with delay zevents
      #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
      #11837 zfs get -p only outputs 3 columns if "clones" property is 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
      #11938 Fix AVX512BW Fletcher code on AVX512-but-not-BW machines
      #11966 Scale worker threads and taskqs with number of CPUs
      #11997 FreeBSD: Don't force xattr mount option
      #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
      #12049 FreeBSD: avoid memory allocation in arc_prune_async
      #12061 Fix dRAID sequential resilver silent damage handling
      #12077 FreeBSD: Retry OCF ENOMEM errors.
      #12088 Propagate vdev state due to invalid label corruption
      #12097 FreeBSD: Update dataset_kstats for zvols in dev mode
    
    Obtained from:  OpenZFS
    OpenZFS commit: 7d9f3ef0ef5c26424d6f1eab2c7d4dfa3e7f9950
    OpenZFS tag:    2.1.0-rc6

 cddl/share/zfs/compatibility.d/Makefile            |    4 +
 .../.github/workflows/zfs-tests-functional.yml     |    6 +
 .../openzfs/.github/workflows/zfs-tests-sanity.yml |    6 +
 sys/contrib/openzfs/.gitmodules                    |    2 +-
 sys/contrib/openzfs/META                           |    4 +-
 sys/contrib/openzfs/Makefile.am                    |   12 +-
 sys/contrib/openzfs/RELEASES.md                    |   37 +
 sys/contrib/openzfs/cmd/arc_summary/arc_summary2   |   97 +-
 sys/contrib/openzfs/cmd/arc_summary/arc_summary3   |   44 +-
 sys/contrib/openzfs/cmd/fsck_zfs/.gitignore        |    1 +
 sys/contrib/openzfs/cmd/fsck_zfs/Makefile.am       |    4 +
 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/vdev_id/vdev_id            |    7 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |    5 +-
 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/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 |    8 +-
 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             |   13 +-
 .../openzfs/cmd/zfs_ids_to_path/zfs_ids_to_path.c  |    8 +-
 sys/contrib/openzfs/cmd/zgenhostid/zgenhostid.c    |    2 +-
 sys/contrib/openzfs/cmd/zpool/Makefile.am          |    4 +
 .../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 +
 sys/contrib/openzfs/cmd/zpool/zpool_iter.c         |   15 +-
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |  184 +-
 sys/contrib/openzfs/cmd/zpool/zpool_vdev.c         |    2 +-
 sys/contrib/openzfs/cmd/zstreamdump/zstreamdump    |    2 +-
 sys/contrib/openzfs/cmd/ztest/ztest.c              |    2 +-
 sys/contrib/openzfs/cmd/zvol_wait/zvol_wait        |   42 +-
 sys/contrib/openzfs/config/CppCheck.am             |    2 +-
 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-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/zfs-build.m4            |    6 +
 .../openzfs/contrib/bash_completion.d/.gitignore   |    1 +
 .../openzfs/contrib/bash_completion.d/Makefile.am  |    5 +-
 .../contrib/bash_completion.d/{zfs => zfs.in}      |   11 +-
 sys/contrib/openzfs/contrib/bpftrace/zfs-trace.sh  |    4 +-
 .../dracut/02zfsexpandknowledge/module-setup.sh.in |    4 +-
 .../contrib/dracut/90zfs/zfs-generator.sh.in       |   78 +-
 .../openzfs/contrib/dracut/90zfs/zfs-lib.sh.in     |   49 +-
 .../dracut/90zfs/zfs-rollback-bootfs.service.in    |    2 +-
 .../dracut/90zfs/zfs-snapshot-bootfs.service.in    |    2 +-
 sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in |    4 +-
 sys/contrib/openzfs/contrib/initramfs/scripts/zfs  |   48 +-
 .../pyzfs/libzfs_core/test/test_libzfs_core.py     |    4 +-
 sys/contrib/openzfs/copy-builtin                   |   45 +-
 .../system-generators/zfs-mount-generator.in       |    1 +
 sys/contrib/openzfs/etc/zfs/zfs-functions.in       |    4 +-
 sys/contrib/openzfs/include/libzfs.h               |   10 +-
 .../openzfs/include/os/freebsd/spl/sys/Makefile.am |    1 -
 .../openzfs/include/os/freebsd/spl/sys/console.h   |   35 -
 .../openzfs/include/os/freebsd/spl/sys/vnode.h     |    5 -
 .../include/os/freebsd/spl/sys/vnode_impl.h        |    2 +-
 .../include/os/freebsd/zfs/sys/zfs_znode_impl.h    |    2 +-
 .../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   |    1 -
 .../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 +
 sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h |    5 +
 sys/contrib/openzfs/include/sys/dsl_scan.h         |    1 +
 sys/contrib/openzfs/include/sys/fm/util.h          |    1 -
 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      |    4 +-
 sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c  |   29 +-
 sys/contrib/openzfs/lib/libshare/os/linux/nfs.c    |   23 +-
 sys/contrib/openzfs/lib/libshare/os/linux/smb.c    |    2 +-
 .../openzfs/lib/libspl/os/linux/gethostid.c        |   41 +-
 .../openzfs/lib/libspl/os/linux/getmntany.c        |    5 +-
 sys/contrib/openzfs/lib/libuutil/uu_open.c         |    8 +-
 sys/contrib/openzfs/lib/libzfs/Makefile.am         |    2 +-
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          | 2084 ++++++++++----------
 sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c     |   14 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c    |   10 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_diff.c       |    4 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_iter.c       |    2 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_mount.c      |   27 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |  258 +--
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |  124 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_status.c     |   28 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |   20 +-
 .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c  |    5 -
 .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c   |   10 +-
 .../lib/libzfs/os/linux/libzfs_sendrecv_os.c       |    2 +-
 .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c   |    4 +-
 sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c  |    2 +-
 .../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        |    4 +-
 sys/contrib/openzfs/lib/libzutil/zutil_import.c    |  111 +-
 sys/contrib/openzfs/lib/libzutil/zutil_nicenum.c   |    3 +
 .../openzfs/man/man5/zfs-module-parameters.5       |   95 +-
 sys/contrib/openzfs/man/man5/zpool-features.5      |   23 +-
 sys/contrib/openzfs/man/man8/fsck.zfs.8            |   26 +-
 sys/contrib/openzfs/man/man8/mount.zfs.8           |  182 +-
 sys/contrib/openzfs/man/man8/zed.8.in              |   40 +-
 sys/contrib/openzfs/man/man8/zfs-allow.8           |    1 +
 sys/contrib/openzfs/man/man8/zfs-jail.8            |    4 +-
 .../openzfs/man/man8/zfs-mount-generator.8.in      |    1 -
 sys/contrib/openzfs/man/man8/zfs-program.8         |    1 +
 sys/contrib/openzfs/man/man8/zfs-send.8            |   12 +-
 sys/contrib/openzfs/man/man8/zfs-wait.8            |    3 +-
 sys/contrib/openzfs/man/man8/zfs.8                 |    2 +-
 sys/contrib/openzfs/man/man8/zfs_ids_to_path.8     |    2 +-
 sys/contrib/openzfs/man/man8/zfsprops.8            |   20 +-
 sys/contrib/openzfs/man/man8/zpool-create.8        |    4 +-
 sys/contrib/openzfs/man/man8/zpool-get.8           |    4 +-
 sys/contrib/openzfs/man/man8/zpool-import.8        |    4 +-
 sys/contrib/openzfs/man/man8/zpool-list.8          |    2 +-
 sys/contrib/openzfs/man/man8/zpool-replace.8       |    2 +-
 sys/contrib/openzfs/man/man8/zpool-split.8         |    2 +-
 sys/contrib/openzfs/man/man8/zpool-upgrade.8       |   16 +-
 sys/contrib/openzfs/man/man8/zstream.8             |    3 +-
 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 +-
 .../openzfs/module/os/freebsd/spl/spl_vfs.c        |    2 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c |    2 +-
 sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c |   16 +-
 .../openzfs/module/os/freebsd/zfs/crypto_os.c      |    8 +-
 .../openzfs/module/os/freebsd/zfs/zfs_acl.c        |   36 +-
 .../openzfs/module/os/freebsd/zfs/zfs_debug.c      |    5 +-
 .../openzfs/module/os/freebsd/zfs/zfs_dir.c        |    4 +-
 .../openzfs/module/os/freebsd/zfs/zfs_file_os.c    |    4 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c     |    2 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   |   36 +-
 .../openzfs/module/os/freebsd/zfs/zfs_znode.c      |   15 +
 .../openzfs/module/os/freebsd/zfs/zio_crypt.c      |   17 +-
 .../openzfs/module/os/freebsd/zfs/zvol_os.c        |    8 +-
 .../openzfs/module/os/linux/spl/spl-generic.c      |    4 +-
 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     |    8 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     |    9 +-
 .../openzfs/module/os/linux/zfs/zfs_znode.c        |    2 +-
 .../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 |    2 +-
 .../openzfs/module/os/linux/zfs/zpl_inode.c        |   41 +-
 .../openzfs/module/os/linux/zfs/zpl_xattr.c        |   35 +-
 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/zfs/abd.c               |    2 +-
 sys/contrib/openzfs/module/zfs/arc.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_scan.c          |    2 +-
 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     |    7 +-
 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/zfs_fm.c            |    8 +-
 sys/contrib/openzfs/module/zfs/zfs_ioctl.c         |    2 +-
 sys/contrib/openzfs/module/zfs/zio.c               |   32 +-
 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/kmodtool               |   16 +-
 sys/contrib/openzfs/scripts/zimport.sh             |    6 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |   22 +-
 sys/contrib/openzfs/tests/runfiles/linux.run       |    8 +-
 sys/contrib/openzfs/tests/runfiles/sanity.run      |    2 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |   25 +-
 .../openzfs/tests/zfs-tests/cmd/draid/draid.c      |    8 +-
 .../tests/zfs-tests/cmd/file_write/file_write.c    |    2 +-
 .../openzfs/tests/zfs-tests/include/libtest.shlib  |   26 +-
 .../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 +-
 .../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 +-
 .../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/zpool_add/zpool_add_dryrun_output.ksh |    4 +-
 .../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   |    2 +-
 .../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 +-
 .../tests/functional/userquota/Makefile.am         |    3 +-
 .../userquota/userspace_send_encrypted.ksh         |  108 -
 .../tests/functional/xattr/xattr_002_neg.ksh       |    4 +-
 sys/modules/zfs/zfs_config.h                       |    6 +-
 282 files changed, 4580 insertions(+), 3367 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,32c8043e68fb..32c8043e68fb
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/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/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/module/os/freebsd/zfs/zfs_znode.c
index 0491b2ff3e28,fd1da03712f1..dace3ec345fa
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
@@@ -1247,12 -1253,16 +1253,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/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..7e910ef6ec43
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 */
 +
 +/* blk_queue_flag_set() exists */
 +/* #undef HAVE_BLK_QUEUE_FLAG_SET */
 +
 +/* blk_queue_flush() is available */
 +/* #undef HAVE_BLK_QUEUE_FLUSH */
 +
 +/* blk_queue_flush() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */
 +
 +/* blk_queue_secdiscard() is available */
 +/* #undef HAVE_BLK_QUEUE_SECDISCARD */
 +
 +/* blk_queue_secure_erase() is available */
 +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
 +
 +/* blk_queue_write_cache() exists */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */
 +
 +/* blk_queue_write_cache() is GPL-only */
 +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */
 +
 +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
 +   CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYCURRENT */
 +
 +/* Define to 1 if you have the Mac OS X function
 +   CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
 +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */
 +
 +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 +   the CoreFoundation framework. */
 +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
 +
 +/* check_disk_change() exists */
 +/* #undef HAVE_CHECK_DISK_CHANGE */
 +
 +/* clear_inode() is available */
 +/* #undef HAVE_CLEAR_INODE */
 +
 +/* dentry uses const struct dentry_operations */
 +/* #undef HAVE_CONST_DENTRY_OPERATIONS */
 +
 +/* copy_from_iter() is available */
 +/* #undef HAVE_COPY_FROM_ITER */
 +
 +/* copy_to_iter() is available */
 +/* #undef HAVE_COPY_TO_ITER */
 +
 +/* yes */
 +/* #undef HAVE_CPU_HOTPLUG */
 +
 +/* current_time() exists */
 +/* #undef HAVE_CURRENT_TIME */
 +
 +/* Define if the GNU dcgettext() function is already present or preinstalled.
 +   */
 +/* #undef HAVE_DCGETTEXT */
 +
 +/* DECLARE_EVENT_CLASS() is available */
 +/* #undef HAVE_DECLARE_EVENT_CLASS */
 +
 +/* lookup_bdev() wants dev_t arg */
 +/* #undef HAVE_DEVT_LOOKUP_BDEV */
 +
 +/* sops->dirty_inode() wants flags */
 +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#define HAVE_DLFCN_H 1
 +
 +/* d_make_root() is available */
 +/* #undef HAVE_D_MAKE_ROOT */
 +
 +/* d_prune_aliases() is available */
 +/* #undef HAVE_D_PRUNE_ALIASES */
 +
 +/* dops->d_revalidate() operation takes nameidata */
 +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */
 +
 +/* eops->encode_fh() wants child and parent inodes */
 +/* #undef HAVE_ENCODE_FH_WITH_INODE */
 +
 +/* sops->evict_inode() exists */
 +/* #undef HAVE_EVICT_INODE */
 +
 +/* fops->aio_fsync() exists */
 +/* #undef HAVE_FILE_AIO_FSYNC */
 +
 +/* file_dentry() is available */
 +/* #undef HAVE_FILE_DENTRY */
 +
 +/* file_inode() is available */
 +/* #undef HAVE_FILE_INODE */
 +
 +/* iops->follow_link() cookie */
 +/* #undef HAVE_FOLLOW_LINK_COOKIE */
 +
 +/* iops->follow_link() nameidata */
 +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */
 +
 +/* fops->fsync() with range */
 +/* #undef HAVE_FSYNC_RANGE */
 +
 +/* fops->fsync() without dentry */
 +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */
 +
 +/* generic_*_io_acct() 3 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */
 +
 +/* generic_*_io_acct() 4 arg available */
 +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
 +
 +/* generic_readlink is global */
 +/* #undef HAVE_GENERIC_READLINK */
 +
 +/* generic_setxattr() exists */
 +/* #undef HAVE_GENERIC_SETXATTR */
 +
 +/* generic_write_checks() takes kiocb */
 +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */
 +
 +/* Define if the GNU gettext() function is already present or preinstalled. */
 +/* #undef HAVE_GETTEXT */
 +
 +/* iops->get_link() cookie */
 +/* #undef HAVE_GET_LINK_COOKIE */
 +
 +/* iops->get_link() delayed */
 +/* #undef HAVE_GET_LINK_DELAYED */
 +
 +/* group_info->gid exists */
 +/* #undef HAVE_GROUP_INFO_GID */
 +
 +/* has_capability() is available */
 +/* #undef HAVE_HAS_CAPABILITY */
 +
 +/* Define if you have the iconv() function and it works. */
 +#define HAVE_ICONV 1
 +
 +/* yes */
 +/* #undef HAVE_INODE_LOCK_SHARED */
 +
 +/* inode_set_flags() exists */
 +/* #undef HAVE_INODE_SET_FLAGS */
 +
 +/* inode_set_iversion() exists */
 +/* #undef HAVE_INODE_SET_IVERSION */
 +
 +/* inode->i_*time's are timespec64 */
 +/* #undef HAVE_INODE_TIMESPEC64_TIMES */
 +
 +/* timestamp_truncate() exists */
 +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
 +
 +/* in_compat_syscall() is available */
 +/* #undef HAVE_IN_COMPAT_SYSCALL */
 +
 +/* iov_iter_advance() is available */
 +/* #undef HAVE_IOV_ITER_ADVANCE */
 +
 +/* iov_iter_count() is available */
 +/* #undef HAVE_IOV_ITER_COUNT */
 +
 +/* iov_iter_fault_in_readable() is available */
 +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */
 +
 +/* iov_iter_init() is available */
 +/* #undef HAVE_IOV_ITER_INIT */
 +
 +/* iov_iter_init() is available */
 +/* #undef HAVE_IOV_ITER_INIT_LEGACY */
 +
 +/* iov_iter_revert() is available */
 +/* #undef HAVE_IOV_ITER_REVERT */
 +
 +/* iov_iter types are available */
 +/* #undef HAVE_IOV_ITER_TYPES */
 +
 +/* yes */
 +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */
 +
 +/* Define to 1 if you have the `issetugid' function. */
 +#define HAVE_ISSETUGID 1
 +
 +/* kernel has kernel_fpu_* functions */
 +/* #undef HAVE_KERNEL_FPU */
 +
 +/* kernel has asm/fpu/api.h */
 +/* #undef HAVE_KERNEL_FPU_API_HEADER */
 +
 +/* kernel fpu internal */
 +/* #undef HAVE_KERNEL_FPU_INTERNAL */
 +
 +/* uncached_acl_sentinel() exists */
 +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */
 +
 +/* kernel does stack verification */
 +/* #undef HAVE_KERNEL_OBJTOOL */
 +
 +/* kernel has linux/objtool.h */
 +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */
 +
 +/* kernel_read() take loff_t pointer */
 +/* #undef HAVE_KERNEL_READ_PPOS */
 +
 +/* timer_list.function gets a timer_list */
 +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */
 +
 +/* struct timer_list has a flags member */
 +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */
 +
 +/* timer_setup() is available */
 +/* #undef HAVE_KERNEL_TIMER_SETUP */
 +
 +/* kernel_write() take loff_t pointer */
 +/* #undef HAVE_KERNEL_WRITE_PPOS */
 +
 +/* kmem_cache_create_usercopy() exists */
 +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */
 +
 +/* kstrtoul() exists */
 +/* #undef HAVE_KSTRTOUL */
 +
 +/* ktime_get_coarse_real_ts64() exists */
 +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */
 +
 +/* ktime_get_raw_ts64() exists */
 +/* #undef HAVE_KTIME_GET_RAW_TS64 */
 +
 +/* kvmalloc exists */
 +/* #undef HAVE_KVMALLOC */
 +
 +/* kernel has large stacks */
 +/* #undef HAVE_LARGE_STACKS */
 +
 +/* Define if you have [aio] */
 +/* #undef HAVE_LIBAIO */
 +
 +/* Define if you have [blkid] */
 +/* #undef HAVE_LIBBLKID */
 +
 +/* Define if you have [crypto] */
 +#define HAVE_LIBCRYPTO 1
 +
 +/* Define if you have [tirpc] */
 +/* #undef HAVE_LIBTIRPC */
 +
 +/* Define if you have [udev] */
 +/* #undef HAVE_LIBUDEV */
 +
 +/* Define if you have [uuid] */
 +/* #undef HAVE_LIBUUID */
 +
 +/* lseek_execute() is available */
 +/* #undef HAVE_LSEEK_EXECUTE */
 +
 +/* makedev() is declared in sys/mkdev.h */
 +/* #undef HAVE_MAKEDEV_IN_MKDEV */
 +
 +/* makedev() is declared in sys/sysmacros.h */
 +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */
 +
 +/* Noting that make_request_fn() returns blk_qc_t */
 +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */
 +
 +/* Noting that make_request_fn() returns void */
 +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#define HAVE_MEMORY_H 1
 +
 +/* iops->create()/mkdir()/mknod() take umode_t */
 +/* #undef HAVE_MKDIR_UMODE_T */
 +
 +/* Define to 1 if you have the `mlockall' function. */
 +#define HAVE_MLOCKALL 1
 +
 +/* lookup_bdev() wants mode arg */
 +/* #undef HAVE_MODE_LOOKUP_BDEV */
 +
 +/* Define if host toolchain supports MOVBE */
 +#define HAVE_MOVBE 1
 +
 +/* new_sync_read()/new_sync_write() are available */
 +/* #undef HAVE_NEW_SYNC_READ */
 +
 +/* iops->getattr() takes a path */
 +/* #undef HAVE_PATH_IOPS_GETATTR */
 +
 +/* Define if host toolchain supports PCLMULQDQ */
 +#define HAVE_PCLMULQDQ 1
 +
 +/* percpu_counter_init() wants gfp_t */
 +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */
 +
 +/* posix_acl_chmod() exists */
 +/* #undef HAVE_POSIX_ACL_CHMOD */
 +
 +/* posix_acl_from_xattr() needs user_ns */
 +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */
 +
 +/* posix_acl_release() is available */
 +/* #undef HAVE_POSIX_ACL_RELEASE */
 +
 +/* posix_acl_release() is GPL-only */
 +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */
 +
 +/* posix_acl_valid() wants user namespace */
 +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */
 +
 +/* proc_ops structure exists */
 +/* #undef HAVE_PROC_OPS_STRUCT */
 +
 +/* iops->put_link() cookie */
 +/* #undef HAVE_PUT_LINK_COOKIE */
 +
 +/* iops->put_link() delayed */
 +/* #undef HAVE_PUT_LINK_DELAYED */
 +
 +/* iops->put_link() nameidata */
 +/* #undef HAVE_PUT_LINK_NAMEIDATA */
 +
 +/* If available, contains the Python version number currently in use. */
 +#define HAVE_PYTHON "3.7"
 +
 +/* qat is enabled and existed */
 +/* #undef HAVE_QAT */
 +
 +/* iops->rename() wants flags */
 +/* #undef HAVE_RENAME_WANTS_FLAGS */
 +
 +/* REQ_DISCARD is defined */
 +/* #undef HAVE_REQ_DISCARD */
 +
 +/* REQ_FLUSH is defined */
 +/* #undef HAVE_REQ_FLUSH */
 +
*** 305 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106081503.158F3xpo039340>