git: 2c00a4216378 - stable/15 - zfs: merge openzfs/zfs@71a9f9578

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Tue, 25 Aug 2026 08:39:01 UTC
The branch stable/15 has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=2c00a4216378d1c7d21cb983d1621a159c755c27

commit 2c00a4216378d1c7d21cb983d1621a159c755c27
Merge: af0e83d9acaa 71a9f9578616
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2026-08-25 07:55:56 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2026-08-25 07:56:48 +0000

    zfs: merge openzfs/zfs@71a9f9578
    
    OpenZFS 2.4.4
    
    Notable upstream pull request merges:
     #18544 eb4199c6a zio_ddt_write: compute have_dvas after taking dde_io_lock
     #18573 0da2e6b39 Update mtime/ctime when fallocate grows a file
     #18611 b021ebcdc zfs_ioctl: fix EBUSY race between quota queries and mount
     #18652 027940e0b zbookmark_compare: handle "marker" bookmarks with
                      negative levels
     #18657 14ff1853c Fix race between device removal completion and pool export
     #18673 -multiple delegate: add send:encrypted permission
     #18688 5f84f4d81 Fix handling of _PC_HAS_HIDDENSYSTEM for FreeBSD
     #18693 7e8f6ad78 Clean up embedded slog metaslab across txgs
     #18706 5e8780ff9 ddt_log: Fix refcount tagging for begin/commit
     #18713 a2c02072f libzfs: fix MS_CRYPT/MS_OVERLAY collision with umount2(2)
                      flags
     #18720 09a876a38 Fix insufficient locking in dedup verify
     #18724 a6f557c2c Fix reads for blocks freed after being cloned
     #18738 b4411799b Fix receive -x according to comment
     #18749 47f32602d Fix receive of split large blocks with a short trailing
                      chunk
     #18795 d6bbb80ae Rate limit Direct I/O verify zevents
     #18802 f5330ea34 libzfs: fallback VDEV_UPATH to VDEV_PATH for non-DMxi
                      devices
     #18822 292c190b8 libspl: Implement VERIFY_IMPLY and VERIFY_EQUIV
     #18827 36a398de2 L2ARC: bound the rebuild by the write hand on a first
                      sweep
     #18833 a052ffc64 zed: let autoexpand see capacity changes on partitioned
                      disks
     #18835 9623afdb9 mmp: skip non-writeable vdevs during activity check
     #18838 fee680504 DDT: Fix several bugs in pruning
     #18840 eb808b3f4 arc: add a few invariant checks in release builds
     #18841 cc010bbc3 zpool export: return EBUSY when zvol minors are in use
     #18848 5f9bea114 dmu_recv: Avoid potential null deref
     #18855 9683c86c4 mmp: do not require writes to mirror legs the config
                      marks absent
     #18865 51421b0ef Fix DMU bonus hold leak on I/O error
     #18867 49086325b Add missing checks to zfs_clone_range_replay()
     #18868 223361144 libzfs: String trimming should not operate out of bounds
     #18869 17834383e libzfs: Do not call munmap() when mmap() fails
     #18871 bcf2999db libzfs: don't truncate a resolved vdev path in
                      zpool_vdev_name()
     #18874 02861fdeb nvpair: Fix operator precedence
     #18876 ec565e143 nvpair: Improve native handling of unterminated strings
     #18877 88c5af639 nvpair: i_get_value_size() string array handling tweak
     #18883 8be87df61 libzfs: don't read a dataset handle after closing it in
                      resume send
     #18886 c714cc5a3 Fix negative time overflows in DDT pruning
     #18892 -multiple zhack: add "mmp reclaim" to recover a pool stranded by
                      MMP
     #18899 9926f72b8 CodeQL: Flag implicit compare-then-assign in branch
                      conditions
    
    Obtained from:  OpenZFS
    OpenZFS commit: 71a9f9578616a90c3c14bb59629fb4d31bfd68d1
    OpenZFS tag:    zfs-2.4.4

 .../openzfs/.github/PULL_REQUEST_TEMPLATE.md       |   6 +-
 sys/contrib/openzfs/.github/codeql-cpp.yml         |   1 +
 .../cpp/AssignmentOfComparisonAsCondition.ql       |  96 +++
 sys/contrib/openzfs/.github/workflows/README.md    |   2 +-
 .../.github/workflows/scripts/qemu-2-start.sh      |  12 +-
 .../.github/workflows/scripts/qemu-3-deps-vm.sh    |   2 +-
 .../.github/workflows/scripts/qemu-4-build-vm.sh   |   7 +-
 .../.github/workflows/scripts/qemu-6-tests.sh      |  41 +-
 sys/contrib/openzfs/.github/workflows/zfs-qemu.yml |  10 +-
 sys/contrib/openzfs/.gitignore                     |   1 +
 sys/contrib/openzfs/META                           |   4 +-
 sys/contrib/openzfs/README.md                      |   2 +-
 sys/contrib/openzfs/SECURITY.md                    |  29 +
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |  57 +-
 sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c       |  59 +-
 sys/contrib/openzfs/cmd/zed/zed_disk_event.c       |  16 +
 sys/contrib/openzfs/cmd/zfs/zfs_main.c             |  15 +-
 sys/contrib/openzfs/cmd/zhack.c                    | 178 ++++
 .../openzfs/config/kernel-follow-down-one.m4       |  23 -
 sys/contrib/openzfs/config/kernel-follow-down.m4   |  70 ++
 sys/contrib/openzfs/config/kernel-fs-context.m4    |  25 +
 sys/contrib/openzfs/config/kernel-idmap.m4         |  64 ++
 sys/contrib/openzfs/config/kernel-rename.m4        |  27 -
 sys/contrib/openzfs/config/kernel-sget-args.m4     |  26 -
 sys/contrib/openzfs/config/kernel-workqueue.m4     |  77 ++
 sys/contrib/openzfs/config/kernel.m4               |  12 +-
 sys/contrib/openzfs/config/zfs-meta.m4             |   6 +-
 sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in |   2 +-
 .../etc/systemd/system/zfs-import-cache.service.in |   4 +-
 .../etc/systemd/system/zfs-import-scan.service.in  |   4 +-
 .../etc/systemd/system/zfs-mount.service.in        |   1 -
 .../etc/systemd/system/zfs-mount@.service.in       |   1 -
 .../etc/systemd/system/zfs-volume-wait.service.in  |   1 -
 .../openzfs/include/os/freebsd/spl/sys/policy.h    |   1 -
 .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h     |   2 +
 sys/contrib/openzfs/include/os/linux/Makefile.am   |   1 +
 .../include/os/linux/kernel/linux/vfs_compat.h     |  46 +
 .../os/linux/kernel/linux/workqueue_compat.h       |  41 +
 .../openzfs/include/os/linux/zfs/sys/abd_os.h      |   8 -
 .../openzfs/include/os/linux/zfs/sys/policy.h      |   1 -
 .../include/os/linux/zfs/sys/zfs_vfsops_os.h       |   2 +
 sys/contrib/openzfs/include/sys/dnode.h            |   2 +
 sys/contrib/openzfs/include/sys/dsl_deleg.h        |   1 +
 sys/contrib/openzfs/include/sys/mmp.h              |   5 +
 sys/contrib/openzfs/include/sys/vdev.h             |   8 +-
 sys/contrib/openzfs/include/sys/vdev_impl.h        |   2 +-
 sys/contrib/openzfs/include/sys/zfs_file.h         |   3 +-
 sys/contrib/openzfs/include/zfs_crrd.h             |   7 +-
 sys/contrib/openzfs/include/zfs_deleg.h            |   1 +
 sys/contrib/openzfs/lib/libefi/rdwr_efi.c          |  10 +-
 sys/contrib/openzfs/lib/libshare/os/linux/smb.c    |   5 +-
 sys/contrib/openzfs/lib/libspl/include/assert.h    |  14 +-
 .../lib/libspl/include/os/freebsd/sys/mount.h      |  17 +-
 .../lib/libspl/include/os/linux/sys/mount.h        |  18 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |  43 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |   6 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |   2 +
 .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c  |   7 +
 .../openzfs/lib/libzfs/os/linux/libzfs_mount_os.c  |   7 +
 sys/contrib/openzfs/lib/libzpool/kernel.c          |   8 +-
 .../openzfs/lib/libzutil/zutil_device_path.c       |   2 +-
 sys/contrib/openzfs/man/man1/zhack.1               |  61 +-
 sys/contrib/openzfs/man/man4/zfs.4                 |   6 +-
 sys/contrib/openzfs/man/man8/zfs-allow.8           |   4 +-
 sys/contrib/openzfs/module/Makefile.in             |   3 +-
 sys/contrib/openzfs/module/nvpair/nvpair.c         |  40 +-
 .../openzfs/module/os/freebsd/spl/spl_policy.c     |   7 -
 .../openzfs/module/os/freebsd/zfs/vdev_geom.c      |   3 +-
 .../openzfs/module/os/freebsd/zfs/zfs_file_os.c    |   7 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c     |  39 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   |   9 +-
 sys/contrib/openzfs/module/os/linux/zfs/abd_os.c   | 148 ----
 sys/contrib/openzfs/module/os/linux/zfs/policy.c   |  29 +-
 .../openzfs/module/os/linux/zfs/vdev_disk.c        |  86 +-
 .../openzfs/module/os/linux/zfs/zfs_file_os.c      |   5 +-
 .../openzfs/module/os/linux/zfs/zfs_vfsops.c       |  31 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     |  45 +-
 .../openzfs/module/os/linux/zfs/zfs_znode_os.c     |   9 +
 .../openzfs/module/os/linux/zfs/zpl_ctldir.c       |  39 +-
 sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c |   7 +-
 .../openzfs/module/os/linux/zfs/zpl_inode.c        |  23 +-
 .../openzfs/module/os/linux/zfs/zpl_super.c        |  13 +-
 sys/contrib/openzfs/module/zcommon/zfs_deleg.c     |   1 +
 sys/contrib/openzfs/module/zfs/arc.c               |  25 +-
 sys/contrib/openzfs/module/zfs/brt.c               |   4 +-
 sys/contrib/openzfs/module/zfs/dbuf.c              |  26 +-
 sys/contrib/openzfs/module/zfs/ddt.c               |  39 +-
 sys/contrib/openzfs/module/zfs/ddt_log.c           |   4 +-
 sys/contrib/openzfs/module/zfs/dmu_recv.c          |  25 +-
 sys/contrib/openzfs/module/zfs/dnode.c             |  31 +
 sys/contrib/openzfs/module/zfs/mmp.c               | 110 ++-
 sys/contrib/openzfs/module/zfs/spa.c               |  61 +-
 sys/contrib/openzfs/module/zfs/spa_config.c        |   4 +-
 sys/contrib/openzfs/module/zfs/vdev.c              |  50 +-
 sys/contrib/openzfs/module/zfs/vdev_draid.c        |   9 +-
 sys/contrib/openzfs/module/zfs/vdev_file.c         |   6 +-
 sys/contrib/openzfs/module/zfs/vdev_indirect.c     |   3 +-
 sys/contrib/openzfs/module/zfs/vdev_mirror.c       |   4 +-
 sys/contrib/openzfs/module/zfs/vdev_missing.c      |   4 +-
 sys/contrib/openzfs/module/zfs/vdev_raidz.c        |   4 +-
 sys/contrib/openzfs/module/zfs/vdev_removal.c      |  10 +-
 sys/contrib/openzfs/module/zfs/vdev_root.c         |   4 +-
 sys/contrib/openzfs/module/zfs/zfs_crrd.c          |  22 +-
 sys/contrib/openzfs/module/zfs/zfs_ioctl.c         | 100 ++-
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |  26 +-
 sys/contrib/openzfs/module/zfs/zio.c               | 134 ++-
 sys/contrib/openzfs/module/zfs/zvol.c              |  11 +
 sys/contrib/openzfs/scripts/cstyle.pl              |  35 +-
 sys/contrib/openzfs/tests/runfiles/common.run      |  28 +-
 sys/contrib/openzfs/tests/runfiles/linux.run       |  17 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |   4 -
 .../openzfs/tests/test-runner/include/logapi.shlib |  14 +-
 sys/contrib/openzfs/tests/zfs-tests/cmd/ctime.c    |   2 +-
 .../openzfs/tests/zfs-tests/include/commands.cfg   |   1 +
 .../openzfs/tests/zfs-tests/include/tunables.cfg   |   1 +
 .../openzfs/tests/zfs-tests/tests/Makefile.am      |  28 +-
 .../tests/functional/acl/acl_common.kshlib         |   1 +
 .../tests/functional/acl/posix/posix_004_pos.ksh   |   1 +
 .../tests/functional/acl/posix/posix_005_pos.ksh   |  71 ++
 .../zfs_receive-x_props_alternation.ksh            |  80 ++
 .../cli_root/zfs_send_delegation/cleanup.ksh       |  43 -
 .../cli_root/zfs_send_delegation/setup.ksh         |  50 --
 .../cli_root/zfs_send_delegation/zfs_send_test.ksh | 111 ---
 .../cli_root/zpool_expand/zpool_expand_006_pos.ksh | 103 +++
 .../cli_root/zpool_export/zpool_export_005_neg.ksh |  89 ++
 .../zpool_initialize_import_export.ksh             |  19 +
 .../zpool_initialize_multiple_pools.ksh            |  20 +-
 .../zpool_initialize_suspend_resume.ksh            |  19 +
 .../zpool_iostat/zpool_iostat_interval_all.ksh     |  13 +-
 .../cli_root/zpool_status/zpool_status_009_pos.ksh |  89 ++
 .../cli_user/zfs_send_delegation_user/cleanup.ksh  |  43 -
 .../cli_user/zfs_send_delegation_user/setup.ksh    |  50 --
 .../zfs_send_delegation_user/zfs_send_usertest.ksh | 150 ----
 .../functional/delegate/delegate_common.kshlib     |  52 +-
 .../tests/functional/delegate/zfs_allow_send.ksh   |  57 ++
 .../tests/functional/device_access/cleanup.ksh     |  21 +
 .../functional/device_access/device_access.kshlib  |  68 ++
 .../functional/device_access/device_access_add.ksh |  63 ++
 .../device_access/device_access_attach.ksh         |  63 ++
 .../device_access/device_access_create.ksh         |  62 ++
 .../device_access/device_access_import.ksh         |  69 ++
 .../tests/functional/device_access/setup.ksh       |  23 +
 .../tests/functional/devices/devices_common.kshlib |  12 +-
 .../tests/functional/direct/dio_write_verify.ksh   |  12 +
 .../tests/functional/events/events_common.kshlib   |   2 +-
 .../fallocate/fallocate_extend_timestamps.ksh      |  77 ++
 .../zfs-tests/tests/functional/migration/setup.ksh |  20 +
 .../zfs-tests/tests/functional/mmp/mmp.kshlib      |  38 +-
 .../tests/functional/mmp/mmp_concurrent_import.ksh |   2 +-
 .../tests/functional/mmp/mmp_degraded_import.ksh   | 159 ++++
 .../tests/functional/mmp/mmp_exported_import.ksh   |  44 +-
 .../tests/functional/mmp/mmp_inactive_import.ksh   |  50 +-
 .../tests/functional/mmp/mmp_zhack_reclaim.ksh     | 305 +++++++
 .../projectquota/projectspace_006_pos.ksh          |  97 +++
 .../zfs-tests/tests/functional/rsend/rsend.kshlib  |  34 +-
 .../tests/functional/rsend/rsend_024_pos.ksh       |   7 +-
 .../rsend/send_large_microzap_incremental.ksh      |   3 +-
 .../rsend/send_large_microzap_transitive.ksh       |   3 +-
 .../functional/rsend/send_partial_dataset.ksh      |   4 +-
 .../functional/rsend/send_split_large_block.ksh    | 144 ++++
 .../tests/functional/stat/statx_dioalign.ksh       |  11 +-
 .../user_namespace_secpolicy_sys_config.ksh        |  46 +
 .../user_namespace_secpolicy_zinject.ksh           |  46 +
 .../functional/userquota/groupspace_005_pos.ksh    | 100 +++
 .../functional/userquota/userspace_005_pos.ksh     | 100 +++
 sys/module/zfs/zfs_config.h                        | 946 +++++++++++++++++++++
 sys/module/zfs/zfs_gitrev.h                        |   1 +
 167 files changed, 5103 insertions(+), 1202 deletions(-)

diff --cc sys/contrib/openzfs/.github/codeql/custom-queries/cpp/AssignmentOfComparisonAsCondition.ql
index 000000000000,394c16eb1146..394c16eb1146
mode 000000,100644..100644
--- a/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/AssignmentOfComparisonAsCondition.ql
+++ b/sys/contrib/openzfs/.github/codeql/custom-queries/cpp/AssignmentOfComparisonAsCondition.ql
diff --cc sys/contrib/openzfs/.gitignore
index a2cb92dd5406,000000000000..2ebf07c86e0b
mode 100644,000000..100644
--- a/sys/contrib/openzfs/.gitignore
+++ b/sys/contrib/openzfs/.gitignore
@@@ -1,90 -1,0 +1,91 @@@
 +#
 +# This is the top-level .gitignore file:
 +# ignore everything except a list of allowed files.
 +#
 +# This is not the place for entries that are specific to
 +# a subdirectory.  Instead add those files to the
 +# .gitignore file in that subdirectory.
 +#
 +# N.B.
 +# Please use 'git ls-files -i --exclude-standard'
 +# command after changing this file, to see if there are
 +# any tracked files which get ignored after the change.
 +
 +*
 +
 +!.github
 +!cmd
 +!config
 +!contrib
 +!etc
 +!include
 +!lib
 +!man
 +!module
 +!rpm
 +!scripts
 +!tests
 +!udev
 +
 +!.github/**
 +!cmd/**
 +!config/**
 +!contrib/**
 +!etc/**
 +!include/**
 +!lib/**
 +!man/**
 +!module/**
 +!rpm/**
 +!scripts/**
 +!tests/**
 +!udev/**
 +
 +!.editorconfig
 +!.cirrus.yml
 +!.gitignore
 +!.gitmodules
 +!.mailmap
 +!AUTHORS
 +!autogen.sh
 +!CODE_OF_CONDUCT.md
 +!configure.ac
 +!copy-builtin
 +!COPYRIGHT
 +!LICENSE
 +!Makefile.am
 +!META
 +!NEWS
 +!NOTICE
 +!README.md
 +!RELEASES.md
++!SECURITY.md
 +!TEST
 +!zfs.release.in
 +
 +#
 +# Normal rules
 +#
 +*.[oa]
 +*.o.ur-safe
 +*.lo
 +*.la
 +*.mod.c
 +*~
 +*.swp
 +*.gcno
 +*.gcda
 +*.pyc
 +*.pyo
 +.deps
 +.libs
 +.dirstamp
 +.DS_Store
 +modules.order
 +Makefile
 +Makefile.in
 +changelog
 +*.patch
 +*.orig
 +*.tmp
 +*.log
diff --cc sys/contrib/openzfs/README.md
index 7aa09cc324f2,000000000000..aa91881255a0
mode 100644,000000..100644
--- a/sys/contrib/openzfs/README.md
+++ b/sys/contrib/openzfs/README.md
@@@ -1,71 -1,0 +1,71 @@@
 +![img](https://openzfs.github.io/openzfs-docs/_static/img/logo/480px-Open-ZFS-Secondary-Logo-Colour-halfsize.png)
 +
 +OpenZFS is an advanced file system and volume manager which was originally
 +developed for Solaris and is now maintained by the OpenZFS community.
 +This repository contains the code for running OpenZFS on Linux and FreeBSD.
 +
 +[![codecov](https://codecov.io/gh/openzfs/zfs/branch/master/graph/badge.svg)](https://codecov.io/gh/openzfs/zfs)
 +[![coverity](https://scan.coverity.com/projects/1973/badge.svg)](https://scan.coverity.com/projects/openzfs-zfs)
 +
 +# Official Resources
 +
 +  * [Documentation](https://openzfs.github.io/openzfs-docs/) - for using and developing this repo
 +  * [ZoL site](https://zfsonlinux.org) - Linux release info & links
 +  * [Mailing lists](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/Mailing%20Lists.html)
 +  * [OpenZFS site](https://openzfs.org/) - for conference videos and info on other platforms (illumos, OSX, Windows, etc)
 +
 +# Installation
 +
 +Full documentation for installing OpenZFS on your favorite operating system can
 +be found at the [Getting Started Page](https://openzfs.github.io/openzfs-docs/Getting%20Started/index.html).
 +
 +# Contribute & Develop
 +
 +We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
 +
 +We have a [Code of Conduct](./CODE_OF_CONDUCT.md).
 +
 +# Release
 +
 +OpenZFS is released under a CDDL license.
 +For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197`
 +
 +# Supported Kernels and Distributions
 +
 +## Linux
 +
 +Given the wide variety of Linux environments, we prioritize development and testing on stable, supported kernels and distributions.
 +
 +### Kernel ([kernel.org](https://kernel.org))
 +
 +All **longterm** kernels from [kernel.org](https://kernel.org) are supported. **stable** kernels are usually supported in the next OpenZFS release.
 +
 +**Supported longterm kernels**: **6.18**, **6.12**, **6.6**, **6.1**, **5.15**, **5.10**.
 +
 +### Red Hat Enterprise Linux (RHEL)
 +
 +All RHEL (and compatible systems: AlmaLinux OS, Rocky Linux, etc) on the **full** or **maintenance** support tracks are supported.
 +
 +**Supported RHEL releases**: **8.10**, **9.7**, **10.1**.
 +
 +### Ubuntu
 +
 +All Ubuntu **LTS** releases are supported.
 +
 +**Supported Ubuntu releases**: **26.04 “Resolute”**, **24.04 “Noble”**, **22.04 “Jammy”**.
 +
 +### Debian
 +
 +All Debian **stable** and **LTS** releases are supported.
 +
 +**Supported Debian releases**: **13 “Trixie”**, **12 “Bookworm”**, **11 “Bullseye”**.
 +
 +### Other Distributions
 +
 +Generally, if a distribution is following an LTS kernel, it should work well with OpenZFS.
 +
 +## FreeBSD
 +
 +All FreeBSD releases receiving **security support** are supported by OpenZFS.
 +
- **Supported FreeBSD releases**: **15.0**, **14.4**.
++**Supported FreeBSD releases**: **15.1**, **14.4**.
diff --cc sys/contrib/openzfs/SECURITY.md
index 000000000000,5d69e8d8b71e..5d69e8d8b71e
mode 000000,100644..100644
--- a/sys/contrib/openzfs/SECURITY.md
+++ b/sys/contrib/openzfs/SECURITY.md
diff --cc sys/contrib/openzfs/config/kernel-follow-down.m4
index 000000000000,88d571f59504..88d571f59504
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-follow-down.m4
+++ b/sys/contrib/openzfs/config/kernel-follow-down.m4
diff --cc sys/contrib/openzfs/config/kernel-idmap.m4
index 000000000000,fd71fdb5d31c..fd71fdb5d31c
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-idmap.m4
+++ b/sys/contrib/openzfs/config/kernel-idmap.m4
diff --cc sys/contrib/openzfs/config/kernel-workqueue.m4
index 000000000000,546ec35f18e4..546ec35f18e4
mode 000000,100644..100644
--- a/sys/contrib/openzfs/config/kernel-workqueue.m4
+++ b/sys/contrib/openzfs/config/kernel-workqueue.m4
diff --cc sys/contrib/openzfs/include/os/linux/kernel/linux/workqueue_compat.h
index 000000000000,3b7d4ef0f093..3b7d4ef0f093
mode 000000,100644..100644
--- a/sys/contrib/openzfs/include/os/linux/kernel/linux/workqueue_compat.h
+++ b/sys/contrib/openzfs/include/os/linux/kernel/linux/workqueue_compat.h
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/posix_005_pos.ksh
index 000000000000,ffb500cd2412..ffb500cd2412
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/posix_005_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/acl/posix/posix_005_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive-x_props_alternation.ksh
index 000000000000,f099519da3e2..f099519da3e2
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive-x_props_alternation.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive-x_props_alternation.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_006_pos.ksh
index 000000000000,f82eea2c12ca..f82eea2c12ca
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_006_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_006_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_005_neg.ksh
index 000000000000,2978f8c6a28d..2978f8c6a28d
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_005_neg.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_005_neg.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_009_pos.ksh
index 000000000000,994963de28da..994963de28da
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_009_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_009_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/zfs_allow_send.ksh
index 000000000000,6e9e78ad7c09..6e9e78ad7c09
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/zfs_allow_send.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/delegate/zfs_allow_send.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/cleanup.ksh
index 000000000000,751dee55ed91..751dee55ed91
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/cleanup.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/cleanup.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access.kshlib
index 000000000000,548c79ff8d5f..548c79ff8d5f
mode 000000,100644..100644
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access.kshlib
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access.kshlib
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_add.ksh
index 000000000000,5794a8440ca2..5794a8440ca2
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_add.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_add.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_attach.ksh
index 000000000000,2cd1d1df1e66..2cd1d1df1e66
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_attach.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_attach.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_create.ksh
index 000000000000,345af7e3645b..345af7e3645b
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_create.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_create.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_import.ksh
index 000000000000,a91e3f2e509e..a91e3f2e509e
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_import.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/device_access_import.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/setup.ksh
index 000000000000,0e174fc30487..0e174fc30487
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/setup.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/device_access/setup.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/fallocate_extend_timestamps.ksh
index 000000000000,e96e3259d141..e96e3259d141
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/fallocate_extend_timestamps.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/fallocate_extend_timestamps.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_degraded_import.ksh
index 000000000000,4f1c0d1b010c..4f1c0d1b010c
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_degraded_import.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_degraded_import.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_zhack_reclaim.ksh
index 000000000000,507c9648284d..507c9648284d
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_zhack_reclaim.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmp/mmp_zhack_reclaim.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/projectquota/projectspace_006_pos.ksh
index 000000000000,29309c68e1bc..29309c68e1bc
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/projectquota/projectspace_006_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/projectquota/projectspace_006_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_split_large_block.ksh
index 000000000000,688f71010503..688f71010503
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_split_large_block.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_split_large_block.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_sys_config.ksh
index 000000000000,c437a6d438ce..c437a6d438ce
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_sys_config.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_sys_config.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_zinject.ksh
index 000000000000,f02824f0e35b..f02824f0e35b
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_zinject.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/user_namespace/user_namespace_secpolicy_zinject.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/groupspace_005_pos.ksh
index 000000000000,1955ae051237..1955ae051237
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/groupspace_005_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/groupspace_005_pos.ksh
diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/userspace_005_pos.ksh
index 000000000000,fd98ded923a5..fd98ded923a5
mode 000000,100755..100755
--- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/userspace_005_pos.ksh
+++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/userquota/userspace_005_pos.ksh
diff --cc sys/module/zfs/zfs_config.h
index 000000000000,000000000000..aa562fa08af7
new file mode 100644
--- /dev/null
+++ b/sys/module/zfs/zfs_config.h
@@@ -1,0 -1,0 +1,946 @@@
++/*
++ */
++
++/* 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 */
++
++/* __assign_str() has one arg */
++/* #undef HAVE_1ARG_ASSIGN_STR */
++
++/* lookup_bdev() wants 1 arg */
++/* #undef HAVE_1ARG_LOOKUP_BDEV */
++
++/* kernel has access_ok with 'type' parameter */
++/* #undef HAVE_ACCESS_OK_TYPE */
++
++/* add_disk() returns int */
++/* #undef HAVE_ADD_DISK_RET */
++
++/* Define if host toolchain supports AES */
++#define HAVE_AES 1
++
++/* Define if you have [rt] */
++#define HAVE_AIO_H 1
++
++/* Define if your assembler supports .cfi_negate_ra_state. */
++/* #undef HAVE_AS_CFI_PSEUDO_OP */
++
++#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
++
++/* backtrace() is available */
++/* #undef HAVE_BACKTRACE */
++
++/* bdevname() is available */
++/* #undef HAVE_BDEVNAME */
++
++/* bdev_check_media_change() exists */
++/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */
++
++/* bdev_file_open_by_path() exists */
++/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */
++
++/* bdev_*_io_acct() available */
++/* #undef HAVE_BDEV_IO_ACCT_63 */
++
++/* bdev_*_io_acct() available */
++/* #undef HAVE_BDEV_IO_ACCT_OLD */
++
++/* bdev_kobj() exists */
++/* #undef HAVE_BDEV_KOBJ */
++
++/* bdev_max_discard_sectors() is available */
++/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */
++
++/* bdev_max_secure_erase_sectors() is available */
++/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */
++
++/* bdev_nr_bytes() is available */
++/* #undef HAVE_BDEV_NR_BYTES */
++
++/* bdev_open_by_path() exists */
++/* #undef HAVE_BDEV_OPEN_BY_PATH */
++
++/* bdev_release() exists */
++/* #undef HAVE_BDEV_RELEASE */
++
++/* block_device_operations->submit_bio() returns void */
++/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */
++
++/* bdev_whole() is available */
++/* #undef HAVE_BDEV_WHOLE */
++
++/* bio_alloc() takes 4 arguments */
++/* #undef HAVE_BIO_ALLOC_4ARG */
++
++/* bio->bi_bdev->bd_disk exists */
++/* #undef HAVE_BIO_BDEV_DISK */
++
++/* bio_*_io_acct() available */
++/* #undef HAVE_BIO_IO_ACCT */
++
++/* bio_max_segs() is implemented */
++/* #undef HAVE_BIO_MAX_SEGS */
++
++/* bio_set_dev() GPL-only */
++/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */
++
++/* bio_set_dev() is a macro */
++/* #undef HAVE_BIO_SET_DEV_MACRO */
++
++/* bio_set_op_attrs is available */
++/* #undef HAVE_BIO_SET_OP_ATTRS */
++
++/* blkdev_get_by_path() exists and takes 4 args */
++/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */
++
++/* blkdev_get_by_path() handles ERESTARTSYS */
++/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */
++
++/* __blkdev_issue_discard(flags) is available */
++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */
++
++/* __blkdev_issue_discard() is available */
++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */
++
++/* blkdev_issue_discard(flags) is available */
++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */
++
++/* blkdev_issue_discard() is available */
++/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */
++
++/* blkdev_issue_secure_erase() is available */
++/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */
++
++/* blkdev_put() exists */
++/* #undef HAVE_BLKDEV_PUT */
++
++/* blkdev_put() accepts void* as arg 2 */
++/* #undef HAVE_BLKDEV_PUT_HOLDER */
++
++/* struct queue_limits has a features field */
++/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */
++
++/* 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_disk() exists and takes 2 args */
++/* #undef HAVE_BLK_ALLOC_DISK_2ARG */
++
++/* 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_cleanup_disk() exists */
++/* #undef HAVE_BLK_CLEANUP_DISK */
++
++/* blk_mode_t is defined */
++/* #undef HAVE_BLK_MODE_T */
++
++/* block multiqueue hardware context is cached in struct request */
++/* #undef HAVE_BLK_MQ_RQ_HCTX */
++
++/* blk queue backing_dev_info is dynamic */
++/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */
++
++/* blk_queue_discard() is available */
++/* #undef HAVE_BLK_QUEUE_DISCARD */
++
++/* backing_dev_info is available through queue gendisk */
++/* #undef HAVE_BLK_QUEUE_DISK_BDI */
++
++/* blk_queue_rot() is available */
++/* #undef HAVE_BLK_QUEUE_ROT */
++
++/* blk_queue_secure_erase() is available */
++/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */
++
++/* blk_queue_update_readahead() exists */
++/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */
++
++/* BLK_STS_RESV_CONFLICT is defined */
++/* #undef HAVE_BLK_STS_RESV_CONFLICT */
++
++/* Define if getgeo() in block_device_operations takes struct gendisk * as its
++   first arg */
++/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_GETGEO_GENDISK */
++
++/* Define if release() in block_device_operations takes 1 arg */
++/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */
++
++/* 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
++   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 */
++
++/* copy_splice_read exists */
++/* #undef HAVE_COPY_SPLICE_READ */
++
++/* cpu_has_feature() is GPL-only */
++/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */
++
++/* Define if the GNU dcgettext() function is already present or preinstalled.
++   */
++/* #undef HAVE_DCGETTEXT */
++
++/* DECLARE_EVENT_CLASS() is available */
++/* #undef HAVE_DECLARE_EVENT_CLASS */
++
++/* dentry aliases are in d_u member */
++/* #undef HAVE_DENTRY_D_U_ALIASES */
++
++/* 3-arg dequeue_signal() takes a type argument */
++/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */
++
++/* dequeue_signal() takes 4 arguments */
++/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */
++
++/* lookup_bdev() wants dev_t arg */
++/* #undef HAVE_DEVT_LOOKUP_BDEV */
++
++/* disk_check_media_change() exists */
++/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */
++
++/* 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
++
++/* dops->d_revalidate() takes 4 args */
++/* #undef HAVE_D_REVALIDATE_4ARGS */
++
++/* Define if d_set_d_op() is available */
++/* #undef HAVE_D_SET_D_OP */
++
++/* Define to 1 if you have the 'execvpe' function. */
++#define HAVE_EXECVPE 1
++
++/* fault_in_iov_iter_readable() is available */
++/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */
++
++/* linux/filelock.h exists */
++/* #undef HAVE_FILELOCK_HEADER */
++
++/* file->f_version exists */
++/* #undef HAVE_FILE_F_VERSION */
++
++/* flush_dcache_page() is GPL-only */
++/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */
++
++/* use __flush_workqueue() to flush delay workqueue */
++/* #undef HAVE_FLUSH_DELAY_WORKQUEUE_INTERNAL */
++
++/* use system_delay_wq for delay workqueue */
++/* #undef HAVE_FLUSH_DELAY_WORKQUEUE_PERCPU */
++
++/* follow_down() takes a flags parameter */
++/* #undef HAVE_FOLLOW_DOWN_FLAGS */
++
++/* Define if compiler supports -Wformat-overflow */
++/* #undef HAVE_FORMAT_OVERFLOW */
++
++/* fsync_bdev() is declared in include/blkdev.h */
++/* #undef HAVE_FSYNC_BDEV */
++
++/* fs_context exists */
++/* #undef HAVE_FS_CONTEXT */
++
++/* fs_parse() takes fs_parameter_spec directly */
++/* #undef HAVE_FS_PARSE_TAKES_SPEC */
++
++/* yes */
++/* #undef HAVE_GENERIC_FADVISE */
++
++/* generic_fillattr requires struct mnt_idmap* */
++/* #undef HAVE_GENERIC_FILLATTR_IDMAP */
++
++/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */
++/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */
++
++/* generic_fillattr requires struct user_namespace* */
++/* #undef HAVE_GENERIC_FILLATTR_USERNS */
++
++/* generic_*_io_acct() 4 arg available */
++/* #undef HAVE_GENERIC_IO_ACCT_4ARG */
++
++/* GENHD_FL_EXT_DEVT flag is available */
++/* #undef HAVE_GENHD_FL_EXT_DEVT */
++
++/* GENHD_FL_NO_PART flag is available */
++/* #undef HAVE_GENHD_FL_NO_PART */
++
++/* Define if the GNU gettext() function is already present or preinstalled. */
++/* #undef HAVE_GETTEXT */
++
++/* Define to 1 if you have the 'gettid' function. */
++/* #undef HAVE_GETTID */
++
++/* iops->get_acl() exists */
++/* #undef HAVE_GET_ACL */
++
++/* iops->get_acl() takes rcu */
++/* #undef HAVE_GET_ACL_RCU */
++
++/* has iops->get_inode_acl() */
++/* #undef HAVE_GET_INODE_ACL */
++
++/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */
++/* #undef HAVE_IATTR_VFSID */
++
++/* Define if you have the iconv() function and it works. */
++#define HAVE_ICONV 1
++
++/* iops->getattr() takes struct mnt_idmap* */
++/* #undef HAVE_IDMAP_IOPS_GETATTR */
++
++/* iops->setattr() takes struct mnt_idmap* */
++/* #undef HAVE_IDMAP_IOPS_SETATTR */
++
++/* id mapping mechanism is mnt_idmap */
++/* #undef HAVE_IDMAP_MNTIDMAP */
++
++/* APIs for idmapped mount are present */
++/* #undef HAVE_IDMAP_MNT_API */
++
++/* mnt_idmap does not have user_namespace */
++/* #undef HAVE_IDMAP_NO_USERNS */
++
++/* id mapping mechanism is user_namespace */
++/* #undef HAVE_IDMAP_USERNS */
++
++/* Define if compiler supports -Wimplicit-fallthrough */
++/* #undef HAVE_IMPLICIT_FALLTHROUGH */
++
++/* Define if compiler supports -Winfinite-recursion */
++/* #undef HAVE_INFINITE_RECURSION */
++
++/* inode_generic_drop() exists */
++/* #undef HAVE_INODE_GENERIC_DROP */
++
++/* inode_get_atime() exists in linux/fs.h */
++/* #undef HAVE_INODE_GET_ATIME */
++
++/* inode_get_ctime() exists in linux/fs.h */
++/* #undef HAVE_INODE_GET_CTIME */
++
++/* inode_get_mtime() exists in linux/fs.h */
++/* #undef HAVE_INODE_GET_MTIME */
++
++/* inode_owner_or_capable() exists */
++/* #undef HAVE_INODE_OWNER_OR_CAPABLE */
++
++/* inode_owner_or_capable() takes mnt_idmap */
++/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */
++
++/* inode_owner_or_capable() takes user_ns */
++/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */
++
++/* inode_set_atime_to_ts() exists in linux/fs.h */
++/* #undef HAVE_INODE_SET_ATIME_TO_TS */
++
++/* inode_set_ctime_to_ts() exists in linux/fs.h */
++/* #undef HAVE_INODE_SET_CTIME_TO_TS */
++
++/* inode_set_mtime_to_ts() exists in linux/fs.h */
++/* #undef HAVE_INODE_SET_MTIME_TO_TS */
++
++/* inode_state_read_once() exists */
++/* #undef HAVE_INODE_STATE_READ_ONCE */
++
++/* timestamp_truncate() exists */
++/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* iops->create() takes struct mnt_idmap* */
++/* #undef HAVE_IOPS_CREATE_IDMAP */
++
++/* iops->create() takes struct user_namespace* */
++/* #undef HAVE_IOPS_CREATE_USERNS */
++
++/* iops->mkdir() returns struct dentry* */
++/* #undef HAVE_IOPS_MKDIR_DENTRY */
++
++/* iops->mkdir() takes struct mnt_idmap* */
++/* #undef HAVE_IOPS_MKDIR_IDMAP */
*** 525 LINES SKIPPED ***