git: 81b22a9892b1 - main - zfs: merge openzfs/zfs@6c8f03232 (master) into main

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Wed, 10 Nov 2021 13:40:37 UTC
The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=81b22a9892b1047e551fc3f1d6d58031bc59a4c3

commit 81b22a9892b1047e551fc3f1d6d58031bc59a4c3
Merge: 2de49deeca0b 6c8f03232aa9
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-11-10 12:41:17 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2021-11-10 13:22:37 +0000

    zfs: merge openzfs/zfs@6c8f03232 (master) into main
    
    Notable upstream pull request merges:
      #12333: Creating gang ABDs for Raidz optional IOs
      #12668: FreeBSD: Catch up with recent VFS changes
      #12687: Skip spacemaps reading in case of pool readonly import
      #12704: Fix some FreeBSD VOPs to synchronize properly with teardown
      #12724: Fix lseek(SEEK_DATA/SEEK_HOLE) mmap consistency
    
    Obtained from:  OpenZFS
    OpenZFS commit: 6c8f03232aa98e950bfe187f9ff53d3541687b50

 .../openzfs/.github/workflows/checkstyle.yaml      |    2 +-
 .../.github/workflows/zfs-tests-functional.yml     |   11 +
 .../openzfs/.github/workflows/zfs-tests-sanity.yml |   11 +
 sys/contrib/openzfs/Makefile.am                    |    7 +-
 sys/contrib/openzfs/cmd/vdev_id/vdev_id            |    2 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |    8 +-
 .../openzfs/cmd/zed/zed.d/statechange-led.sh       |   73 +-
 sys/contrib/openzfs/cmd/zed/zed.d/zed.rc           |    4 +-
 sys/contrib/openzfs/cmd/zpool/zpool.d/ses          |    8 +-
 sys/contrib/openzfs/config/ax_python_devel.m4      |    2 +-
 sys/contrib/openzfs/config/kernel-bio.m4           |    3 +-
 sys/contrib/openzfs/config/zfs-build.m4            |   14 +-
 sys/contrib/openzfs/configure.ac                   |    1 +
 .../contrib/initramfs/README.initramfs.markdown    |    4 +-
 .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c      |   72 +-
 .../openzfs/include/os/freebsd/spl/sys/vnode.h     |   20 +
 .../include/os/freebsd/zfs/sys/zfs_znode_impl.h    |    3 +-
 .../include/os/linux/kernel/linux/blkdev_compat.h  |    2 +-
 .../include/os/linux/zfs/sys/zfs_znode_impl.h      |    1 +
 sys/contrib/openzfs/include/sys/dnode.h            |    1 +
 sys/contrib/openzfs/include/sys/spa_impl.h         |    1 +
 sys/contrib/openzfs/include/sys/zstd/zstd.h        |    2 +
 sys/contrib/openzfs/include/sys/zvol.h             |    1 -
 sys/contrib/openzfs/lib/libnvpair/libnvpair.abi    | 2292 +++++----
 sys/contrib/openzfs/lib/libuutil/libuutil.abi      | 1436 +++---
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          | 4861 +++++++++-----------
 sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c    |   22 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |   17 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |   48 +-
 .../openzfs/lib/libzfs_core/libzfs_core.abi        | 1678 ++++---
 .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi    |   81 +-
 .../lib/libzutil/os/linux/zutil_device_path_os.c   |  146 +-
 sys/contrib/openzfs/lib/libzutil/zutil_nicenum.c   |    9 +
 sys/contrib/openzfs/man/man4/zfs.4                 |    2 +-
 sys/contrib/openzfs/man/man7/zfsprops.7            |    5 +
 sys/contrib/openzfs/module/Makefile.in             |    4 +-
 sys/contrib/openzfs/module/nvpair/nvpair.c         |    6 +-
 .../openzfs/module/os/freebsd/zfs/vdev_geom.c      |    1 -
 .../openzfs/module/os/freebsd/zfs/zfs_file_os.c    |    4 +
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   |   18 +-
 .../openzfs/module/os/linux/spl/spl-generic.c      |    1 +
 .../openzfs/module/os/linux/spl/spl-taskq.c        |   11 +-
 .../openzfs/module/os/linux/zfs/vdev_disk.c        |    4 +-
 .../openzfs/module/os/linux/zfs/zfs_ctldir.c       |   23 +-
 sys/contrib/openzfs/module/unicode/u8_textprep.c   |    4 +
 sys/contrib/openzfs/module/zfs/dmu.c               |   53 +-
 sys/contrib/openzfs/module/zfs/dnode.c             |   20 +
 sys/contrib/openzfs/module/zfs/dsl_scan.c          |  101 +-
 sys/contrib/openzfs/module/zfs/metaslab.c          |    6 +-
 sys/contrib/openzfs/module/zfs/spa.c               |  292 +-
 sys/contrib/openzfs/module/zfs/vdev.c              |    6 +
 sys/contrib/openzfs/module/zfs/vdev_raidz.c        |  172 +-
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |   24 +-
 sys/contrib/openzfs/module/zfs/zvol.c              |   45 -
 sys/contrib/openzfs/scripts/mancheck.sh            |   20 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |    3 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |    1 +
 .../openzfs/tests/zfs-tests/cmd/Makefile.am        |    1 +
 .../tests/zfs-tests/cmd/mmap_seek/.gitignore       |    1 +
 .../tests/zfs-tests/cmd/mmap_seek/Makefile.am      |    6 +
 .../tests/zfs-tests/cmd/mmap_seek/mmap_seek.c      |  147 +
 .../openzfs/tests/zfs-tests/include/commands.cfg   |    1 +
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |    1 +
 .../tests/functional/bootfs/bootfs_002_neg.ksh     |   11 +-
 .../tests/functional/casenorm/casenorm.kshlib      |    2 +-
 .../tests/functional/casenorm/norm_all_values.ksh  |   11 +
 .../channel_program/lua_core/tst.exists.ksh        |    2 +-
 .../channel_program/lua_core/tst.return_large.ksh  |    2 +-
 .../synctask_core/tst.get_string_props.ksh         |    4 +-
 .../synctask_core/tst.terminate_by_signal.ksh      |    2 +-
 .../tests/functional/cli_root/zfs/zfs_002_pos.ksh  |    4 +-
 .../cli_root/zfs_bookmark/zfs_bookmark_cliargs.ksh |   17 +-
 .../cli_root/zfs_change-key/zfs_change-key.ksh     |    2 +-
 .../zfs_change-key/zfs_change-key_child.ksh        |    2 +-
 .../zfs_change-key/zfs_change-key_clones.ksh       |    2 +-
 .../zfs_change-key/zfs_change-key_format.ksh       |    2 +-
 .../zfs_change-key/zfs_change-key_inherit.ksh      |    2 +-
 .../zfs_change-key/zfs_change-key_load.ksh         |    2 +-
 .../zfs_change-key/zfs_change-key_location.ksh     |    2 +-
 .../zfs_change-key/zfs_change-key_pbkdf2iters.ksh  |    2 +-
 .../cli_root/zfs_clone/zfs_clone_001_neg.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_002_pos.ksh       |    8 +-
 .../cli_root/zfs_clone/zfs_clone_003_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_004_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_005_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_006_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_007_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_008_neg.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_009_neg.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_010_pos.ksh       |    4 +-
 .../cli_root/zfs_clone/zfs_clone_encrypted.ksh     |    4 +-
 .../cli_root/zfs_copies/zfs_copies_001_pos.ksh     |    8 +-
 .../cli_root/zfs_copies/zfs_copies_002_pos.ksh     |    5 +-
 .../cli_root/zfs_copies/zfs_copies_003_pos.ksh     |    4 +-
 .../cli_root/zfs_copies/zfs_copies_006_pos.ksh     |    4 +-
 .../cli_root/zfs_create/zfs_create_001_pos.ksh     |    2 +-
 .../cli_root/zfs_create/zfs_create_003_pos.ksh     |    3 +-
 .../cli_root/zfs_create/zfs_create_004_pos.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_005_pos.ksh     |    2 +-
 .../cli_root/zfs_create/zfs_create_006_pos.ksh     |    2 +-
 .../cli_root/zfs_create/zfs_create_008_neg.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_011_pos.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_012_pos.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_014_pos.ksh     |    3 +-
 .../zfs_create/zfs_create_crypt_combos.ksh         |    4 +-
 .../cli_root/zfs_create/zfs_create_dryrun.ksh      |    5 +-
 .../cli_root/zfs_create/zfs_create_encrypted.ksh   |    4 +-
 .../cli_root/zfs_create/zfs_create_verbose.ksh     |    5 +-
 .../cli_root/zfs_destroy/zfs_destroy_001_pos.ksh   |    4 +-
 .../cli_root/zfs_destroy/zfs_destroy_003_pos.ksh   |    7 +-
 .../cli_root/zfs_destroy/zfs_destroy_004_pos.ksh   |   10 +-
 .../cli_root/zfs_destroy/zfs_destroy_007_neg.ksh   |    4 +-
 .../cli_root/zfs_destroy/zfs_destroy_014_pos.ksh   |    2 +-
 .../cli_root/zfs_destroy/zfs_destroy_015_pos.ksh   |    4 +-
 .../cli_root/zfs_destroy/zfs_destroy_016_pos.ksh   |    8 +-
 .../zfs_destroy/zfs_destroy_clone_livelist.ksh     |    2 +-
 .../cli_root/zfs_destroy/zfs_destroy_common.kshlib |    4 +-
 .../cli_root/zfs_diff/zfs_diff_cliargs.ksh         |    4 +-
 .../cli_root/zfs_diff/zfs_diff_timestamp.ksh       |    4 +-
 .../cli_root/zfs_get/zfs_get_001_pos.ksh           |   17 +-
 .../cli_root/zfs_get/zfs_get_004_pos.ksh           |    9 +-
 .../cli_root/zfs_get/zfs_get_list_d.kshlib         |    4 +-
 .../cli_root/zfs_inherit/zfs_inherit_002_neg.ksh   |    5 +-
 .../cli_root/zfs_inherit/zfs_inherit_003_pos.ksh   |    4 +-
 .../cli_root/zfs_load-key/zfs_load-key.ksh         |    2 +-
 .../cli_root/zfs_load-key/zfs_load-key_all.ksh     |   16 +-
 .../cli_root/zfs_load-key/zfs_load-key_file.ksh    |    2 +-
 .../cli_root/zfs_load-key/zfs_load-key_https.ksh   |    2 +-
 .../zfs_load-key/zfs_load-key_location.ksh         |    2 +-
 .../cli_root/zfs_load-key/zfs_load-key_noop.ksh    |    2 +-
 .../zfs_load-key/zfs_load-key_recursive.ksh        |    2 +-
 .../cli_root/zfs_mount/zfs_mount_008_pos.ksh       |    4 +-
 .../cli_root/zfs_mount/zfs_mount_011_neg.ksh       |    7 +-
 .../cli_root/zfs_mount/zfs_mount_encrypted.ksh     |    2 +-
 .../cli_root/zfs_mount/zfs_mount_remount.ksh       |    2 +-
 .../cli_root/zfs_promote/zfs_promote_001_pos.ksh   |    3 +-
 .../cli_root/zfs_promote/zfs_promote_003_pos.ksh   |    3 +-
 .../cli_root/zfs_promote/zfs_promote_004_pos.ksh   |    3 +-
 .../cli_root/zfs_promote/zfs_promote_005_pos.ksh   |    4 +-
 .../cli_root/zfs_promote/zfs_promote_006_neg.ksh   |    8 +-
 .../cli_root/zfs_promote/zfs_promote_007_neg.ksh   |    3 +-
 .../zfs_promote/zfs_promote_encryptionroot.ksh     |    6 +-
 .../zfs_property/zfs_written_property_001_pos.ksh  |    2 +-
 .../functional/cli_root/zfs_receive/Makefile.am    |    1 +
 .../zfs_receive/receive-o-x_props_aliases.ksh      |  213 +
 .../cli_root/zfs_receive/zfs_receive_001_pos.ksh   |    9 +-
 .../cli_root/zfs_receive/zfs_receive_002_pos.ksh   |    9 +-
 .../cli_root/zfs_receive/zfs_receive_003_pos.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_004_neg.ksh   |    3 +-
 .../cli_root/zfs_receive/zfs_receive_005_neg.ksh   |    6 +-
 .../cli_root/zfs_receive/zfs_receive_006_pos.ksh   |    6 +-
 .../cli_root/zfs_receive/zfs_receive_007_neg.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_008_pos.ksh   |   10 +-
 .../cli_root/zfs_receive/zfs_receive_009_neg.ksh   |    9 +-
 .../cli_root/zfs_receive/zfs_receive_013_pos.ksh   |    2 +-
 .../zfs_receive/zfs_receive_from_encrypted.ksh     |    4 +-
 .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh |    4 +-
 .../cli_root/zfs_receive/zfs_receive_raw.ksh       |    4 +-
 .../cli_root/zfs_receive/zfs_receive_raw_-d.ksh    |    2 +-
 .../zfs_receive/zfs_receive_raw_incremental.ksh    |    4 +-
 .../zfs_receive/zfs_receive_to_encrypted.ksh       |    4 +-
 .../cli_root/zfs_rename/zfs_rename.kshlib          |   10 +-
 .../cli_root/zfs_rename/zfs_rename_003_pos.ksh     |    2 +-
 .../cli_root/zfs_rename/zfs_rename_007_pos.ksh     |    5 +-
 .../cli_root/zfs_rename/zfs_rename_008_pos.ksh     |   11 +-
 .../cli_root/zfs_rename/zfs_rename_011_pos.ksh     |   17 +-
 .../cli_root/zfs_rename/zfs_rename_013_pos.ksh     |   20 +-
 .../zfs_rename/zfs_rename_encrypted_child.ksh      |    4 +-
 .../zfs_rename/zfs_rename_to_encrypted.ksh         |    2 +-
 .../cli_root/zfs_rollback/zfs_rollback_001_pos.ksh |    4 +-
 .../cli_root/zfs_rollback/zfs_rollback_003_neg.ksh |    4 +-
 .../cli_root/zfs_rollback/zfs_rollback_004_neg.ksh |    5 +-
 .../zfs_rollback/zfs_rollback_common.kshlib        |    4 +-
 .../functional/cli_root/zfs_send/zfs_send-b.ksh    |    2 +-
 .../cli_root/zfs_send/zfs_send_001_pos.ksh         |    6 +-
 .../cli_root/zfs_send/zfs_send_002_pos.ksh         |    7 +-
 .../cli_root/zfs_send/zfs_send_003_pos.ksh         |    4 +-
 .../cli_root/zfs_send/zfs_send_004_neg.ksh         |    3 +-
 .../cli_root/zfs_send/zfs_send_005_pos.ksh         |    2 +-
 .../cli_root/zfs_send/zfs_send_encrypted.ksh       |    2 +-
 .../zfs_send/zfs_send_encrypted_unloaded.ksh       |    2 +-
 .../functional/cli_root/zfs_send/zfs_send_raw.ksh  |    6 +-
 .../cli_root/zfs_send/zfs_send_skip_missing.ksh    |    4 +-
 .../cli_root/zfs_send/zfs_send_sparse.ksh          |    8 +-
 .../cli_root/zfs_set/canmount_001_pos.ksh          |   11 +-
 .../cli_root/zfs_set/canmount_002_pos.ksh          |   13 +-
 .../cli_root/zfs_set/canmount_003_pos.ksh          |    7 +-
 .../cli_root/zfs_set/readonly_001_pos.ksh          |    2 +-
 .../cli_root/zfs_set/snapdir_001_pos.ksh           |    3 +-
 .../cli_root/zfs_set/user_property_004_pos.ksh     |    4 +-
 .../cli_root/zfs_set/zfs_set_003_neg.ksh           |    5 +-
 .../cli_root/zfs_set/zfs_set_keylocation.ksh       |    2 +-
 .../cli_root/zfs_share/zfs_share_001_pos.ksh       |    7 +-
 .../cli_root/zfs_share/zfs_share_004_pos.ksh       |    5 +-
 .../cli_root/zfs_share/zfs_share_006_pos.ksh       |    2 +-
 .../cli_root/zfs_share/zfs_share_011_pos.ksh       |   10 +-
 .../zfs_share/zfs_share_concurrent_shares.ksh      |    6 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh |    2 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh |    5 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh |    8 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh |    8 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh |    4 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh |    4 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh |    9 +-
 .../cli_root/zfs_unload-key/zfs_unload-key.ksh     |    2 +-
 .../cli_root/zfs_unload-key/zfs_unload-key_all.ksh |    7 +-
 .../zfs_unload-key/zfs_unload-key_recursive.ksh    |    2 +-
 .../cli_root/zfs_unmount/zfs_unmount_001_pos.ksh   |    2 +-
 .../cli_root/zfs_unmount/zfs_unmount_008_neg.ksh   |    8 +-
 .../cli_root/zfs_unmount/zfs_unmount_009_pos.ksh   |    4 +-
 .../zfs_unmount/zfs_unmount_unload_keys.ksh        |    6 +-
 .../cli_root/zfs_unshare/zfs_unshare_001_pos.ksh   |   15 +-
 .../cli_root/zfs_unshare/zfs_unshare_002_pos.ksh   |   15 +-
 .../cli_root/zfs_unshare/zfs_unshare_003_pos.ksh   |    5 +-
 .../cli_root/zfs_unshare/zfs_unshare_007_pos.ksh   |    5 +-
 .../cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh   |    8 +-
 .../cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh   |    4 +-
 .../cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh   |    4 +-
 .../cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh   |    4 +-
 .../zpool_destroy/zpool_destroy_001_pos.ksh        |    3 +-
 .../zpool_destroy/zpool_destroy_002_pos.ksh        |    2 +-
 .../zpool_history/zpool_history_001_neg.ksh        |    4 +-
 .../functional/cli_root/zpool_import/cleanup.ksh   |    3 +-
 .../cli_root/zpool_import/zpool_import_012_pos.ksh |    6 +-
 .../zpool_scrub/zpool_scrub_encrypted_unloaded.ksh |    2 +-
 .../async_destroy/async_destroy_001_pos.ksh        |    2 +-
 .../features/large_dnode/large_dnode_001_pos.ksh   |    2 +-
 .../features/large_dnode/large_dnode_002_pos.ksh   |    2 +-
 .../features/large_dnode/large_dnode_004_neg.ksh   |    4 +-
 .../features/large_dnode/large_dnode_005_pos.ksh   |    9 +-
 .../features/large_dnode/large_dnode_006_pos.ksh   |    2 +-
 .../features/large_dnode/large_dnode_009_pos.ksh   |    4 +-
 .../tests/functional/history/history_002_pos.ksh   |    2 +-
 .../tests/functional/history/history_006_neg.ksh   |    4 +-
 .../tests/functional/history/history_007_pos.ksh   |    2 +-
 .../tests/functional/history/history_008_pos.ksh   |    4 +-
 .../tests/functional/history/history_010_pos.ksh   |    2 +-
 .../tests/functional/history/history_common.kshlib |    4 +-
 .../largest_pool/largest_pool_001_pos.ksh          |    6 +-
 .../zfs-tests/tests/functional/mmap/Makefile.am    |    3 +-
 .../tests/functional/mmap/mmap_seek_001_pos.ksh    |   67 +
 .../tests/functional/nopwrite/nopwrite_copies.ksh  |    2 +-
 .../tests/functional/nopwrite/nopwrite_mtime.ksh   |    2 +-
 .../functional/nopwrite/nopwrite_negative.ksh      |    2 +-
 .../nopwrite/nopwrite_promoted_clone.ksh           |    2 +-
 .../tests/functional/nopwrite/nopwrite_recsize.ksh |    2 +-
 .../tests/functional/nopwrite/nopwrite_sync.ksh    |    2 +-
 .../nopwrite/nopwrite_varying_compression.ksh      |    2 +-
 .../tests/functional/nopwrite/nopwrite_volume.ksh  |    2 +-
 .../tests/functional/pam/utilities.kshlib          |    2 +-
 .../tests/functional/procfs/procfs_list_basic.ksh  |    2 +-
 .../procfs/procfs_list_concurrent_readers.ksh      |    2 +-
 .../projectquota/projectquota_004_neg.ksh          |    4 +-
 .../projectquota/projectquota_005_pos.ksh          |    4 +-
 .../projectquota/projectquota_008_pos.ksh          |    4 +-
 .../projectquota/projectquota_009_pos.ksh          |    4 +-
 .../projectquota/projectspace_001_pos.ksh          |    4 +-
 .../projectquota/projectspace_002_pos.ksh          |    4 +-
 .../projectquota/projectspace_003_pos.ksh          |    4 +-
 .../projectquota/projectspace_004_pos.ksh          |    4 +-
 .../tests/functional/quota/quota_005_pos.ksh       |    3 +-
 .../functional/refreserv/refreserv_002_pos.ksh     |    6 +-
 .../functional/reservation/reservation_002_pos.ksh |    2 +-
 .../functional/reservation/reservation_003_pos.ksh |    2 +-
 .../functional/reservation/reservation_004_pos.ksh |    2 +-
 .../functional/reservation/reservation_005_pos.ksh |    2 +-
 .../functional/reservation/reservation_007_pos.ksh |    8 +-
 .../functional/reservation/reservation_008_pos.ksh |    2 +-
 .../functional/reservation/reservation_009_pos.ksh |    4 +-
 .../functional/reservation/reservation_010_pos.ksh |    2 +-
 .../functional/reservation/reservation_013_pos.ksh |    4 +-
 .../functional/reservation/reservation_014_pos.ksh |    2 +-
 .../functional/reservation/reservation_015_pos.ksh |    3 +-
 .../functional/reservation/reservation_016_pos.ksh |    3 +-
 .../functional/reservation/reservation_018_pos.ksh |    2 +-
 .../tests/functional/rsend/send-c_lz4_disabled.ksh |    4 +-
 .../functional/rsend/send-c_recv_lz4_disabled.ksh  |    4 +-
 .../rsend/send-c_stream_size_estimate.ksh          |    4 +-
 .../functional/rsend/send-cpL_varied_recsize.ksh   |    4 +-
 .../functional/rsend/send_encrypted_files.ksh      |    4 +-
 .../rsend/send_encrypted_truncated_files.ksh       |    4 +-
 .../tests/functional/rsend/send_mixed_raw.ksh      |    6 +-
 .../functional/rsend/send_realloc_dnode_size.ksh   |    9 +-
 .../tests/functional/snapshot/clone_001_pos.ksh    |    4 +-
 .../tests/functional/snapshot/snapshot_011_pos.ksh |    3 +-
 .../tests/functional/snapshot/snapshot_012_pos.ksh |    7 +-
 .../tests/functional/snapshot/snapshot_013_pos.ksh |    7 +-
 .../tests/functional/snapshot/snapshot_014_pos.ksh |    3 +-
 .../tests/functional/snapshot/snapshot_015_pos.ksh |    2 +-
 .../tests/functional/snapshot/snapshot_016_pos.ksh |   19 +-
 .../tests/functional/snapshot/snapshot_017_pos.ksh |    5 +-
 .../tests/functional/snapused/snapused_001_pos.ksh |    2 +-
 .../tests/functional/snapused/snapused_002_pos.ksh |    2 +-
 .../tests/functional/snapused/snapused_003_pos.ksh |    2 +-
 .../tests/functional/snapused/snapused_004_pos.ksh |    2 +-
 .../tests/functional/snapused/snapused_005_pos.ksh |    2 +-
 .../functional/userquota/groupspace_001_pos.ksh    |    4 +-
 .../functional/userquota/groupspace_002_pos.ksh    |    4 +-
 .../functional/userquota/groupspace_003_pos.ksh    |    4 +-
 .../functional/userquota/userquota_005_neg.ksh     |    4 +-
 .../functional/userquota/userquota_006_pos.ksh     |    4 +-
 .../functional/userquota/userquota_009_pos.ksh     |    4 +-
 .../functional/userquota/userquota_011_pos.ksh     |    4 +-
 .../functional/userquota/userquota_012_neg.ksh     |    4 +-
 .../functional/userquota/userspace_001_pos.ksh     |    4 +-
 .../functional/userquota/userspace_002_pos.ksh     |    4 +-
 .../functional/userquota/userspace_003_pos.ksh     |    4 +-
 .../functional/zvol/zvol_cli/zvol_cli_002_pos.ksh  |    2 +-
 .../tests/functional/zvol/zvol_common.shlib        |    5 +-
 .../zvol/zvol_misc/zvol_misc_002_pos.ksh           |    2 +-
 .../zvol/zvol_misc/zvol_misc_004_pos.ksh           |    5 +-
 .../zvol/zvol_misc/zvol_misc_snapdev.ksh           |    4 +-
 .../zvol/zvol_swap/zvol_swap_004_pos.ksh           |    2 +-
 sys/modules/zfs/zfs_config.h                       |    4 +-
 sys/modules/zfs/zfs_gitrev.h                       |    2 +-
 315 files changed, 6701 insertions(+), 6527 deletions(-)

diff --cc sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h
index 3670712a0456,000000000000..1ac595aa15dd
mode 100644,000000..100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h
@@@ -1,208 -1,0 +1,228 @@@
 +/*
 + * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
 + * $FreeBSD$
 + */
 +
 +#ifndef _OPENSOLARIS_SYS_VNODE_H_
 +#define	_OPENSOLARIS_SYS_VNODE_H_
 +
 +struct vnode;
 +struct vattr;
 +struct xucred;
 +
 +typedef struct flock	flock64_t;
 +typedef	struct vnode	vnode_t;
 +typedef	struct vattr	vattr_t;
 +typedef enum vtype vtype_t;
 +
 +#include <sys/types.h>
 +#include <sys/queue.h>
 +#include_next <sys/sdt.h>
 +#include <sys/namei.h>
 +enum symfollow { NO_FOLLOW = NOFOLLOW };
 +
 +#define	NOCRED	((struct ucred *)0)	/* no credential available */
 +#define	F_FREESP	11 	/* Free file space */
 +
 +#include <sys/proc.h>
 +#include <sys/vnode_impl.h>
 +#ifndef IN_BASE
 +#include_next <sys/vnode.h>
 +#endif
 +#include <sys/mount.h>
 +#include <sys/cred.h>
 +#include <sys/fcntl.h>
 +#include <sys/refcount.h>
 +#include <sys/file.h>
 +#include <sys/filedesc.h>
 +#include <sys/syscallsubr.h>
++#include <sys/vm.h>
++#include <vm/vm_object.h>
 +
 +typedef	struct vop_vector	vnodeops_t;
 +#define	VOP_FID		VOP_VPTOFH
 +#define	vop_fid		vop_vptofh
 +#define	vop_fid_args	vop_vptofh_args
 +#define	a_fid		a_fhp
 +
 +#define	rootvfs		(rootvnode == NULL ? NULL : rootvnode->v_mount)
 +
 +#ifndef IN_BASE
 +static __inline int
 +vn_is_readonly(vnode_t *vp)
 +{
 +	return (vp->v_mount->mnt_flag & MNT_RDONLY);
 +}
 +#endif
 +#define	vn_vfswlock(vp)		(0)
 +#define	vn_vfsunlock(vp)	do { } while (0)
 +#define	vn_ismntpt(vp)	   \
 +	((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL)
 +#define	vn_mountedvfs(vp)	((vp)->v_mountedhere)
 +#define	vn_has_cached_data(vp)	\
 +	((vp)->v_object != NULL && \
 +	(vp)->v_object->resident_page_count > 0)
++
++#ifndef IN_BASE
++static __inline void
++vn_flush_cached_data(vnode_t *vp, boolean_t sync)
++{
++#if __FreeBSD_version > 1300054
++	if (vm_object_mightbedirty(vp->v_object)) {
++#else
++	if (vp->v_object->flags & OBJ_MIGHTBEDIRTY) {
++#endif
++		int flags = sync ? OBJPC_SYNC : 0;
++		zfs_vmobject_wlock(vp->v_object);
++		vm_object_page_clean(vp->v_object, 0, 0, flags);
++		zfs_vmobject_wunlock(vp->v_object);
++	}
++}
++#endif
++
 +#define	vn_exists(vp)		do { } while (0)
 +#define	vn_invalid(vp)		do { } while (0)
 +#define	vn_renamepath(tdvp, svp, tnm, lentnm)	do { } while (0)
 +#define	vn_free(vp)		do { } while (0)
 +#define	vn_matchops(vp, vops)	((vp)->v_op == &(vops))
 +
 +#define	VN_HOLD(v)	vref(v)
 +#define	VN_RELE(v)	vrele(v)
 +#define	VN_URELE(v)	vput(v)
 +
 +#define	vnevent_create(vp, ct)			do { } while (0)
 +#define	vnevent_link(vp, ct)			do { } while (0)
 +#define	vnevent_remove(vp, dvp, name, ct)	do { } while (0)
 +#define	vnevent_rmdir(vp, dvp, name, ct)	do { } while (0)
 +#define	vnevent_rename_src(vp, dvp, name, ct)	do { } while (0)
 +#define	vnevent_rename_dest(vp, dvp, name, ct)	do { } while (0)
 +#define	vnevent_rename_dest_dir(vp, ct)		do { } while (0)
 +
 +#define	specvp(vp, rdev, type, cr)	(VN_HOLD(vp), (vp))
 +#define	MANDLOCK(vp, mode)	(0)
 +
 +/*
 + * We will use va_spare is place of Solaris' va_mask.
 + * This field is initialized in zfs_setattr().
 + */
 +#define	va_mask		va_spare
 +/* TODO: va_fileid is shorter than va_nodeid !!! */
 +#define	va_nodeid	va_fileid
 +/* TODO: This field needs conversion! */
 +#define	va_nblocks	va_bytes
 +#define	va_blksize	va_blocksize
 +#define	va_seq		va_gen
 +
 +#define	MAXOFFSET_T	OFF_MAX
 +#define	EXCL		0
 +
 +#define	FCREAT		O_CREAT
 +#define	FTRUNC		O_TRUNC
 +#define	FEXCL		O_EXCL
 +#ifndef FDSYNC
 +#define	FDSYNC		FFSYNC
 +#endif
 +#define	FRSYNC		FFSYNC
 +#define	FSYNC		FFSYNC
 +#define	FOFFMAX		0x00
 +#define	FIGNORECASE	0x00
 +
 +/*
 + * Attributes of interest to the caller of setattr or getattr.
 + */
 +#define	AT_MODE		0x00002
 +#define	AT_UID		0x00004
 +#define	AT_GID		0x00008
 +#define	AT_FSID		0x00010
 +#define	AT_NODEID	0x00020
 +#define	AT_NLINK	0x00040
 +#define	AT_SIZE		0x00080
 +#define	AT_ATIME	0x00100
 +#define	AT_MTIME	0x00200
 +#define	AT_CTIME	0x00400
 +#define	AT_RDEV		0x00800
 +#define	AT_BLKSIZE	0x01000
 +#define	AT_NBLOCKS	0x02000
 +/*			0x04000 */	/* unused */
 +#define	AT_SEQ		0x08000
 +/*
 + * If AT_XVATTR is set then there are additional bits to process in
 + * the xvattr_t's attribute bitmap.  If this is not set then the bitmap
 + * MUST be ignored.  Note that this bit must be set/cleared explicitly.
 + * That is, setting AT_ALL will NOT set AT_XVATTR.
 + */
 +#define	AT_XVATTR	0x10000
 +
 +#define	AT_ALL		(AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\
 +			AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|\
 +			AT_RDEV|AT_BLKSIZE|AT_NBLOCKS|AT_SEQ)
 +
 +#define	AT_STAT		(AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\
 +			AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV)
 +
 +#define	AT_TIMES	(AT_ATIME|AT_MTIME|AT_CTIME)
 +
 +#define	AT_NOSET	(AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|\
 +			AT_BLKSIZE|AT_NBLOCKS|AT_SEQ)
 +
 +#ifndef IN_BASE
 +static __inline void
 +vattr_init_mask(vattr_t *vap)
 +{
 +
 +	vap->va_mask = 0;
 +
 +	if (vap->va_uid != (uid_t)VNOVAL)
 +		vap->va_mask |= AT_UID;
 +	if (vap->va_gid != (gid_t)VNOVAL)
 +		vap->va_mask |= AT_GID;
 +	if (vap->va_size != (u_quad_t)VNOVAL)
 +		vap->va_mask |= AT_SIZE;
 +	if (vap->va_atime.tv_sec != VNOVAL)
 +		vap->va_mask |= AT_ATIME;
 +	if (vap->va_mtime.tv_sec != VNOVAL)
 +		vap->va_mask |= AT_MTIME;
 +	if (vap->va_mode != (uint16_t)VNOVAL)
 +		vap->va_mask |= AT_MODE;
 +	if (vap->va_flags != VNOVAL)
 +		vap->va_mask |= AT_XVATTR;
 +}
 +#endif
 +
 +#define		RLIM64_INFINITY 0
 +
 +static __inline int
 +vn_rename(char *from, char *to, enum uio_seg seg)
 +{
 +
 +	ASSERT(seg == UIO_SYSSPACE);
 +
 +	return (kern_renameat(curthread, AT_FDCWD, from, AT_FDCWD, to, seg));
 +}
 +
 +#include <sys/vfs.h>
 +
 +#endif	/* _OPENSOLARIS_SYS_VNODE_H_ */
diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore
index 000000000000,6b05a7917500..6b05a7917500
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore
diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am
index 000000000000,b938931125f5..b938931125f5
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am
diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
index 000000000000,f476e1dba9a4..f476e1dba9a4
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh
index 000000000000,d4b0aa2341fc..d4b0aa2341fc
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/receive-o-x_props_aliases.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh
index 000000000000,6188549ad8d2..6188549ad8d2
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh
diff --cc sys/modules/zfs/zfs_config.h
index 8bbe141827db,000000000000..a893f3431c85
mode 100644,000000..100644
--- a/sys/modules/zfs/zfs_config.h
+++ b/sys/modules/zfs/zfs_config.h
@@@ -1,864 -1,0 +1,864 @@@
 +/*
 + * $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_bdev->bd_disk exists */
 +/* #undef HAVE_BIO_BDEV_DISK */
 +
 +/* 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_max_segs() is implemented */
 +/* #undef HAVE_BIO_MAX_SEGS */
 +
 +/* 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_disk() exists */
 +/* #undef HAVE_BLK_ALLOC_DISK */
 +
 +/* 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_update_readahead() exists */
 +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
 +
 +/* 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 if revalidate_disk() in block_device_operations */
 +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */
 +
 +/* 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 */
 +
 +/* disk_*_io_acct() available */
 +/* #undef HAVE_DISK_IO_ACCT */
 +
 +/* disk_update_readahead() exists */
 +/* #undef HAVE_DISK_UPDATE_READAHEAD */
 +
 +/* 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_fillattr requires struct user_namespace* */
 +/* #undef HAVE_GENERIC_FILLATTR_USERNS */
 +
 +/* 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_acl() exists */
 +/* #undef HAVE_GET_ACL */
 +
 +/* iops->get_acl() takes rcu */
 +/* #undef HAVE_GET_ACL_RCU */
 +
 +/* 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_owner_or_capable() exists */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
 +
 +/* inode_owner_or_capable() takes user_ns */
 +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED */
 +
 +/* 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 */
 +
 +/* iops->create() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_CREATE_USERNS */
 +
 +/* iops->mkdir() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKDIR_USERNS */
 +
 +/* iops->mknod() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_MKNOD_USERNS */
 +
 +/* iops->rename() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_RENAME_USERNS */
 +
 +/* iops->symlink() takes struct user_namespace* */
 +/* #undef HAVE_IOPS_SYMLINK_USERNS */
 +
 +/* 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_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 */
 +
*** 496 LINES SKIPPED ***