git: 716fd348e01c - main - zfs: merge openzfs/zfs@c0cf6ed67

From: Martin Matuska <mm_at_FreeBSD.org>
Date: Wed, 18 May 2022 23:05:54 UTC
The branch main has been updated by mm:

URL: https://cgit.FreeBSD.org/src/commit/?id=716fd348e01c5f2ba125f878a634a753436c2994

commit 716fd348e01c5f2ba125f878a634a753436c2994
Merge: 4e2d3f26bd12 c0cf6ed6792e
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2022-05-18 22:54:40 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2022-05-18 22:55:59 +0000

    zfs: merge openzfs/zfs@c0cf6ed67
    
    Notable upstream pull request merges:
      #10662 zvol_wait: Ignore locked zvols
      #12789 Improve log spacemap load time
      #12812 Improved zpool status output, list all affected datasets
      #13277 FreeBSD: Use NDFREE_PNBUF if available
      #13302 Make zfs_max_recordsize default to 16M
      #13311 Fix error handling in FreeBSD's get/putpages VOPs
      #13345 FreeBSD: Fix translation from ABD to physical pages
      #13373 zfs: holds: dequadratify
      #13375 Corrected edge case in uncompressed ARC->L2ARC handling
      #13388 Improve mg_aliquot math
      #13405 Reduce dbuf_find() lock contention
      #13406 FreeBSD: use zero_region instead of allocating a dedicated page
    
    Obtained from:  OpenZFS
    OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8

 cddl/usr.bin/ztest/Makefile                        |    3 +-
 cddl/usr.sbin/zhack/Makefile                       |    2 +-
 .../openzfs/.github/workflows/checkstyle.yaml      |    4 +-
 sys/contrib/openzfs/.github/workflows/zloop.yml    |    5 +-
 sys/contrib/openzfs/.gitignore                     |   90 +-
 sys/contrib/openzfs/Makefile.am                    |  145 +-
 sys/contrib/openzfs/autogen.sh                     |   62 +-
 sys/contrib/openzfs/cmd/Makefile.am                |  126 +-
 .../cmd/{arc_summary/arc_summary3 => arc_summary}  |    0
 sys/contrib/openzfs/cmd/arc_summary/.gitignore     |    1 -
 sys/contrib/openzfs/cmd/arc_summary/Makefile.am    |    8 -
 sys/contrib/openzfs/cmd/{arcstat => }/arcstat.in   |    0
 sys/contrib/openzfs/cmd/arcstat/.gitignore         |    1 -
 sys/contrib/openzfs/cmd/arcstat/Makefile.am        |    5 -
 sys/contrib/openzfs/cmd/{dbufstat => }/dbufstat.in |    0
 sys/contrib/openzfs/cmd/dbufstat/.gitignore        |    1 -
 sys/contrib/openzfs/cmd/dbufstat/Makefile.am       |    5 -
 sys/contrib/openzfs/cmd/{fsck_zfs => }/fsck.zfs.in |    4 +-
 sys/contrib/openzfs/cmd/fsck_zfs/.gitignore        |    1 -
 sys/contrib/openzfs/cmd/fsck_zfs/Makefile.am       |    7 -
 .../openzfs/cmd/{mount_zfs => }/mount_zfs.c        |    0
 sys/contrib/openzfs/cmd/mount_zfs/.gitignore       |    1 -
 sys/contrib/openzfs/cmd/mount_zfs/Makefile.am      |   22 -
 sys/contrib/openzfs/cmd/raidz_test/.gitignore      |    1 -
 sys/contrib/openzfs/cmd/raidz_test/Makefile.am     |   24 +-
 sys/contrib/openzfs/cmd/vdev_id/Makefile.am        |    3 -
 sys/contrib/openzfs/cmd/zdb/.gitignore             |    1 -
 sys/contrib/openzfs/cmd/zdb/Makefile.am            |   22 +-
 sys/contrib/openzfs/cmd/zdb/zdb.c                  |    6 +-
 sys/contrib/openzfs/cmd/zed/Makefile.am            |   87 +-
 sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am      |   69 +-
 sys/contrib/openzfs/cmd/zed/zed.d/all-debug.sh     |    2 +-
 sys/contrib/openzfs/cmd/zed/zed.d/zed-functions.sh |    3 +-
 sys/contrib/openzfs/cmd/zed/zed.d/zed.rc           |    4 +-
 sys/contrib/openzfs/cmd/zed/zed_event.c            |   10 +-
 sys/contrib/openzfs/cmd/zfs/.gitignore             |    1 -
 sys/contrib/openzfs/cmd/zfs/Makefile.am            |   27 +-
 sys/contrib/openzfs/cmd/zfs/zfs_main.c             |  228 +--
 sys/contrib/openzfs/cmd/zfs/zfs_util.h             |    2 +-
 .../cmd/{zfs_ids_to_path => }/zfs_ids_to_path.c    |    0
 sys/contrib/openzfs/cmd/zfs_ids_to_path/.gitignore |    1 -
 .../openzfs/cmd/zfs_ids_to_path/Makefile.am        |   11 -
 .../openzfs/cmd/{zgenhostid => }/zgenhostid.c      |    0
 sys/contrib/openzfs/cmd/zgenhostid/.gitignore      |    1 -
 sys/contrib/openzfs/cmd/zgenhostid/Makefile.am     |    7 -
 sys/contrib/openzfs/cmd/{zhack => }/zhack.c        |    0
 sys/contrib/openzfs/cmd/zhack/.gitignore           |    1 -
 sys/contrib/openzfs/cmd/zhack/Makefile.am          |   16 -
 sys/contrib/openzfs/cmd/zinject/.gitignore         |    1 -
 sys/contrib/openzfs/cmd/zinject/Makefile.am        |   19 +-
 sys/contrib/openzfs/cmd/zpool/.gitignore           |    1 -
 sys/contrib/openzfs/cmd/zpool/Makefile.am          |  190 +-
 sys/contrib/openzfs/cmd/zpool/zpool.d/iostat       |   16 +-
 sys/contrib/openzfs/cmd/zpool/zpool.d/lsblk        |   16 +-
 sys/contrib/openzfs/cmd/zpool/zpool.d/smart        |   12 +-
 sys/contrib/openzfs/cmd/zpool/zpool_main.c         |   53 +-
 sys/contrib/openzfs/cmd/zpool_influxdb/.gitignore  |    1 -
 sys/contrib/openzfs/cmd/zpool_influxdb/Makefile.am |   15 +-
 sys/contrib/openzfs/cmd/zstream/.gitignore         |    1 -
 sys/contrib/openzfs/cmd/zstream/Makefile.am        |   24 +-
 sys/contrib/openzfs/cmd/{ztest => }/ztest.c        |  117 +-
 sys/contrib/openzfs/cmd/ztest/.gitignore           |    1 -
 sys/contrib/openzfs/cmd/ztest/Makefile.am          |   25 -
 sys/contrib/openzfs/cmd/zvol_id/.gitignore         |    1 -
 sys/contrib/openzfs/cmd/zvol_id/Makefile.am        |   12 -
 sys/contrib/openzfs/cmd/zvol_id/zvol_id_main.c     |  129 --
 sys/contrib/openzfs/cmd/{zvol_wait => }/zvol_wait  |   10 +-
 sys/contrib/openzfs/cmd/zvol_wait/Makefile.am      |    4 -
 sys/contrib/openzfs/config/Abigail.am              |   52 -
 sys/contrib/openzfs/config/CppCheck.am             |   16 +-
 sys/contrib/openzfs/config/Rules.am                |   54 +-
 sys/contrib/openzfs/config/Shellcheck.am           |   40 +-
 sys/contrib/openzfs/config/Substfiles.am           |   48 +-
 sys/contrib/openzfs/config/always-cppcheck.m4      |    3 +
 sys/contrib/openzfs/config/always-system.m4        |    4 +
 sys/contrib/openzfs/config/config.awk              |   15 -
 sys/contrib/openzfs/config/deb.am                  |    4 +-
 sys/contrib/openzfs/config/kernel-blk-queue.m4     |   12 +-
 .../openzfs/config/kernel-config-defined.m4        |   88 +-
 .../config/kernel-copy-from-user-inatomic.m4       |   29 +
 sys/contrib/openzfs/config/kernel-genhd-flags.m4   |   58 +
 .../openzfs/config/kernel-global_page_state.m4     |    2 +-
 sys/contrib/openzfs/config/kernel-group-info.m4    |    4 +-
 .../openzfs/config/kernel-inode-permission.m4      |   29 +
 sys/contrib/openzfs/config/kernel-mkdir.m4         |    2 +
 sys/contrib/openzfs/config/kernel-readpages.m4     |   25 +
 sys/contrib/openzfs/config/kernel-sysfs.m4         |   37 +
 .../config/kernel-vfs-filemap_dirty_folio.m4       |   30 +
 sys/contrib/openzfs/config/kernel.m4               |   49 +-
 sys/contrib/openzfs/config/user-systemd.m4         |    7 +-
 sys/contrib/openzfs/config/user-sysvinit.m4        |    7 +-
 sys/contrib/openzfs/config/user.m4                 |   11 -
 sys/contrib/openzfs/config/zfs-build.m4            |   10 +-
 sys/contrib/openzfs/configure.ac                   |  353 +---
 sys/contrib/openzfs/contrib/Makefile.am            |   15 +-
 .../openzfs/contrib/bash_completion.d/Makefile.am  |   13 +-
 sys/contrib/openzfs/contrib/bpftrace/Makefile.am   |    8 +-
 .../openzfs/contrib/dracut/{90zfs => }/.gitignore  |    0
 .../contrib/dracut/02zfsexpandknowledge/.gitignore |    1 -
 .../dracut/02zfsexpandknowledge/Makefile.am        |    8 -
 .../openzfs/contrib/dracut/90zfs/Makefile.am       |   24 -
 .../contrib/dracut/90zfs/module-setup.sh.in        |    5 -
 .../openzfs/contrib/dracut/90zfs/mount-zfs.sh.in   |  130 +-
 .../openzfs/contrib/dracut/90zfs/parse-zfs.sh.in   |   67 +-
 .../contrib/dracut/90zfs/zfs-env-bootfs.service.in |    2 +-
 .../contrib/dracut/90zfs/zfs-generator.sh.in       |   30 +-
 .../openzfs/contrib/dracut/90zfs/zfs-lib.sh.in     |  181 +-
 .../contrib/dracut/90zfs/zfs-load-key.sh.in        |  105 +-
 .../contrib/dracut/90zfs/zfs-needshutdown.sh.in    |    2 +-
 .../dracut/90zfs/zfs-rollback-bootfs.service.in    |    6 +-
 .../dracut/90zfs/zfs-snapshot-bootfs.service.in    |    6 +-
 sys/contrib/openzfs/contrib/dracut/Makefile.am     |   29 +-
 sys/contrib/openzfs/contrib/dracut/README.md       |   16 +-
 sys/contrib/openzfs/contrib/initramfs/Makefile.am  |   42 +-
 .../contrib/initramfs/conf-hooks.d/Makefile.am     |    4 -
 .../openzfs/contrib/initramfs/conf.d/Makefile.am   |    4 -
 .../openzfs/contrib/initramfs/hooks/Makefile.am    |   10 -
 .../openzfs/contrib/initramfs/scripts/Makefile.am  |   11 -
 .../initramfs/scripts/local-top/Makefile.am        |    7 -
 sys/contrib/openzfs/contrib/initramfs/scripts/zfs  |    6 +-
 .../openzfs/contrib/pam_zfs_key/Makefile.am        |   25 +-
 sys/contrib/openzfs/contrib/pyzfs/Makefile.am      |   32 +-
 .../pyzfs/libzfs_core/test/test_libzfs_core.py     |    2 +
 sys/contrib/openzfs/contrib/pyzfs/setup.py.in      |    8 +-
 sys/contrib/openzfs/contrib/zcp/Makefile.am        |    2 +-
 sys/contrib/openzfs/copy-builtin                   |   28 +-
 sys/contrib/openzfs/etc/Makefile.am                |   96 +-
 sys/contrib/openzfs/etc/default/Makefile.am        |    8 -
 sys/contrib/openzfs/etc/init.d/Makefile.am         |   10 -
 sys/contrib/openzfs/etc/init.d/zfs-mount.in        |   86 +-
 sys/contrib/openzfs/etc/init.d/zfs-zed.in          |    3 +-
 sys/contrib/openzfs/etc/modules-load.d/.gitignore  |    1 -
 sys/contrib/openzfs/etc/modules-load.d/Makefile.am |    2 -
 sys/contrib/openzfs/etc/sudoers.d/Makefile.am      |    5 -
 sys/contrib/openzfs/etc/systemd/Makefile.am        |    4 -
 .../etc/systemd/system-generators/Makefile.am      |   14 -
 sys/contrib/openzfs/etc/systemd/system/.gitignore  |    1 -
 .../system/{50-zfs.preset.in => 50-zfs.preset}     |    0
 sys/contrib/openzfs/etc/systemd/system/Makefile.am |   24 -
 sys/contrib/openzfs/etc/zfs/Makefile.am            |   18 -
 sys/contrib/openzfs/include/Makefile.am            |  180 +-
 sys/contrib/openzfs/include/libzfs.h               |   41 +-
 sys/contrib/openzfs/include/libzutil.h             |    4 +-
 sys/contrib/openzfs/include/os/Makefile.am         |    6 -
 sys/contrib/openzfs/include/os/freebsd/Makefile.am |   91 +-
 .../openzfs/include/os/freebsd/linux/Makefile.am   |    5 -
 .../openzfs/include/os/freebsd/spl/Makefile.am     |    1 -
 .../openzfs/include/os/freebsd/spl/acl/Makefile.am |    4 -
 .../openzfs/include/os/freebsd/spl/rpc/Makefile.am |    4 -
 .../openzfs/include/os/freebsd/spl/sys/Makefile.am |   73 -
 .../openzfs/include/os/freebsd/spl/sys/ccompile.h  |    3 -
 .../openzfs/include/os/freebsd/spl/sys/misc.h      |    2 -
 .../openzfs/include/os/freebsd/spl/sys/mod_os.h    |    5 -
 .../openzfs/include/os/freebsd/spl/sys/sunddi.h    |    1 -
 .../openzfs/include/os/freebsd/spl/sys/vnode.h     |   10 -
 .../openzfs/include/os/freebsd/zfs/Makefile.am     |    1 -
 .../openzfs/include/os/freebsd/zfs/sys/Makefile.am |   15 -
 .../include/os/freebsd/zfs/sys/zfs_znode_impl.h    |   32 +-
 sys/contrib/openzfs/include/os/linux/Makefile.am   |  112 +-
 .../openzfs/include/os/linux/kernel/Makefile.am    |    1 -
 .../include/os/linux/kernel/linux/Makefile.am      |   22 -
 .../include/os/linux/kernel/linux/mod_compat.h     |    7 -
 .../openzfs/include/os/linux/spl/Makefile.am       |    1 -
 .../openzfs/include/os/linux/spl/rpc/Makefile.am   |    7 -
 .../openzfs/include/os/linux/spl/sys/Makefile.am   |   64 -
 .../openzfs/include/os/linux/spl/sys/sunddi.h      |    1 -
 .../openzfs/include/os/linux/zfs/Makefile.am       |    1 -
 .../openzfs/include/os/linux/zfs/sys/Makefile.am   |   31 -
 .../openzfs/include/os/linux/zfs/sys/trace_acl.h   |   14 +-
 .../include/os/linux/zfs/sys/zfs_vnops_os.h        |    2 +-
 sys/contrib/openzfs/include/sys/Makefile.am        |  151 --
 sys/contrib/openzfs/include/sys/crypto/Makefile.am |   16 -
 sys/contrib/openzfs/include/sys/dbuf.h             |    7 +-
 sys/contrib/openzfs/include/sys/dmu.h              |    2 +
 sys/contrib/openzfs/include/sys/dsl_dataset.h      |    3 +
 sys/contrib/openzfs/include/sys/fm/Makefile.am     |   17 -
 sys/contrib/openzfs/include/sys/fm/fs/Makefile.am  |   14 -
 sys/contrib/openzfs/include/sys/fs/Makefile.am     |   14 -
 sys/contrib/openzfs/include/sys/lua/Makefile.am    |   17 -
 sys/contrib/openzfs/include/sys/metaslab.h         |    3 +
 sys/contrib/openzfs/include/sys/metaslab_impl.h    |    1 +
 sys/contrib/openzfs/include/sys/mod.h              |    5 -
 sys/contrib/openzfs/include/sys/spa.h              |    8 +-
 sys/contrib/openzfs/include/sys/spa_log_spacemap.h |    9 +-
 .../openzfs/include/sys/sysevent/Makefile.am       |   15 -
 sys/contrib/openzfs/include/sys/zfs_context.h      |    4 -
 sys/contrib/openzfs/include/sys/zfs_znode.h        |    2 +
 sys/contrib/openzfs/include/sys/zio.h              |   14 +
 sys/contrib/openzfs/include/sys/zstd/Makefile.am   |   18 -
 sys/contrib/openzfs/include/zfeature_common.h      |    1 +
 sys/contrib/openzfs/lib/Makefile.am                |  105 +-
 sys/contrib/openzfs/lib/libavl/Makefile.am         |   18 +-
 sys/contrib/openzfs/lib/libefi/Makefile.am         |   18 +-
 sys/contrib/openzfs/lib/libicp/Makefile.am         |  107 +-
 sys/contrib/openzfs/lib/libnvpair/Makefile.am      |   47 +-
 sys/contrib/openzfs/lib/libnvpair/libnvpair.abi    |    2 +-
 sys/contrib/openzfs/lib/libshare/Makefile.am       |   39 +-
 sys/contrib/openzfs/lib/libshare/libshare.c        |  332 +---
 sys/contrib/openzfs/lib/libshare/libshare_impl.h   |   41 +-
 sys/contrib/openzfs/lib/libshare/nfs.c             |   77 +-
 sys/contrib/openzfs/lib/libshare/nfs.h             |    3 +-
 sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c  |   70 +-
 sys/contrib/openzfs/lib/libshare/os/freebsd/smb.c  |   54 +-
 sys/contrib/openzfs/lib/libshare/os/linux/nfs.c    |  127 +-
 sys/contrib/openzfs/lib/libshare/os/linux/smb.c    |  153 +-
 sys/contrib/openzfs/lib/libshare/smb.h             |    4 -
 sys/contrib/openzfs/lib/libspl/Makefile.am         |   62 +-
 sys/contrib/openzfs/lib/libspl/include/Makefile.am |  125 +-
 sys/contrib/openzfs/lib/libspl/include/libshare.h  |   39 +-
 .../openzfs/lib/libspl/include/os/Makefile.am      |    7 -
 .../lib/libspl/include/os/freebsd/Makefile.am      |    5 -
 .../lib/libspl/include/os/freebsd/sys/Makefile.am  |   12 -
 .../lib/libspl/include/os/freebsd/sys/file.h       |    8 -
 .../lib/libspl/include/os/linux/Makefile.am        |    1 -
 .../lib/libspl/include/os/linux/sys/Makefile.am    |   10 -
 .../openzfs/lib/libspl/include/rpc/Makefile.am     |    3 -
 sys/contrib/openzfs/lib/libspl/include/stdio.h     |   34 -
 .../openzfs/lib/libspl/include/sys/Makefile.am     |   47 -
 .../lib/libspl/include/sys/dktp/Makefile.am        |    4 -
 .../openzfs/lib/libspl/include/util/Makefile.am    |    3 -
 .../openzfs/lib/libspl/include/util/sscanf.h       |   30 -
 sys/contrib/openzfs/lib/libspl/timestamp.c         |    5 +-
 sys/contrib/openzfs/lib/libtpool/Makefile.am       |   20 +-
 sys/contrib/openzfs/lib/libunicode/Makefile.am     |   18 +-
 sys/contrib/openzfs/lib/libuutil/Makefile.am       |   34 +-
 sys/contrib/openzfs/lib/libuutil/libuutil.abi      |  193 +-
 sys/contrib/openzfs/lib/libzfs/Makefile.am         |  122 +-
 sys/contrib/openzfs/lib/libzfs/libzfs.abi          |  206 +--
 sys/contrib/openzfs/lib/libzfs/libzfs_changelist.c |   64 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_config.c     |   34 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c     |    2 -
 sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c    |   80 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_diff.c       |    5 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_impl.h       |   40 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_import.c     |   53 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_iter.c       |   19 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_mount.c      |  364 +---
 sys/contrib/openzfs/lib/libzfs/libzfs_pool.c       |  152 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c   |  103 +-
 sys/contrib/openzfs/lib/libzfs/libzfs_util.c       |   34 +-
 .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c  |    6 +-
 sys/contrib/openzfs/lib/libzfs_core/Makefile.am    |   43 +-
 sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c  |   13 +
 sys/contrib/openzfs/lib/libzfsbootenv/Makefile.am  |   38 +-
 .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi    |   37 +-
 sys/contrib/openzfs/lib/libzpool/Makefile.am       |  400 ++--
 sys/contrib/openzfs/lib/libzpool/kernel.c          |   19 +-
 sys/contrib/openzfs/lib/libzstd/Makefile.am        |   70 +-
 sys/contrib/openzfs/lib/libzutil/Makefile.am       |   51 +-
 .../lib/libzutil/os/freebsd/zutil_device_path_os.c |    6 +-
 .../lib/libzutil/os/linux/zutil_device_path_os.c   |   18 +-
 sys/contrib/openzfs/lib/libzutil/zutil_pool.c      |    5 +-
 sys/contrib/openzfs/man/Makefile.am                |  204 +-
 sys/contrib/openzfs/man/man1/cstyle.1              |   28 +-
 .../test-runner/man => man/man1}/test-runner.1     |    0
 sys/contrib/openzfs/man/man1/ztest.1               |   12 +-
 sys/contrib/openzfs/man/man4/zfs.4                 |  198 +-
 sys/contrib/openzfs/man/man7/dracut.zfs.7          |  278 +++
 sys/contrib/openzfs/man/man7/zfsprops.7            |   25 +-
 sys/contrib/openzfs/man/man7/zpool-features.7      |   27 +-
 sys/contrib/openzfs/man/man7/zpoolconcepts.7       |    6 +-
 sys/contrib/openzfs/man/man8/zed.8.in              |    2 +-
 sys/contrib/openzfs/man/man8/zfs-allow.8           |   24 +-
 sys/contrib/openzfs/man/man8/zfs-bookmark.8        |    6 +-
 sys/contrib/openzfs/man/man8/zfs-program.8         |   11 +-
 sys/contrib/openzfs/man/man8/zfs-send.8            |   41 +-
 sys/contrib/openzfs/man/man8/zfs-set.8             |    5 +-
 sys/contrib/openzfs/man/man8/zfs.8                 |   52 +-
 sys/contrib/openzfs/man/man8/zpool-import.8        |    3 +-
 sys/contrib/openzfs/man/man8/zpool-list.8          |    2 +-
 sys/contrib/openzfs/man/man8/zpool.8               |    2 +-
 sys/contrib/openzfs/module/Kbuild.in               |  427 ++++-
 sys/contrib/openzfs/module/Makefile.in             |   61 +-
 sys/contrib/openzfs/module/avl/Makefile.in         |   10 -
 sys/contrib/openzfs/module/avl/avl.c               |   22 -
 sys/contrib/openzfs/module/icp/Makefile.in         |   90 -
 sys/contrib/openzfs/module/icp/algs/edonr/edonr.c  |    5 +-
 sys/contrib/openzfs/module/icp/algs/modes/gcm.c    |    2 +-
 sys/contrib/openzfs/module/icp/illumos-crypto.c    |    7 +-
 sys/contrib/openzfs/module/lua/Makefile.in         |   39 -
 sys/contrib/openzfs/module/lua/lapi.c              |   23 -
 sys/contrib/openzfs/module/nvpair/Makefile.in      |   13 -
 sys/contrib/openzfs/module/nvpair/nvpair.c         |   21 -
 .../openzfs/module/os/freebsd/spl/spl_misc.c       |    4 -
 .../openzfs/module/os/freebsd/spl/spl_sunddi.c     |   13 -
 .../openzfs/module/os/freebsd/zfs/vdev_geom.c      |    6 +-
 .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c   |   33 +-
 .../openzfs/module/os/freebsd/zfs/zfs_znode.c      |    8 +
 .../openzfs/module/os/freebsd/zfs/zvol_os.c        |   12 +-
 .../openzfs/module/os/linux/spl/Makefile.in        |   17 -
 .../openzfs/module/os/linux/spl/spl-generic.c      |   58 +-
 .../openzfs/module/os/linux/spl/spl-kmem-cache.c   |    2 +-
 .../openzfs/module/os/linux/zfs/Makefile.in        |   38 -
 sys/contrib/openzfs/module/os/linux/zfs/abd_os.c   |    1 -
 .../openzfs/module/os/linux/zfs/vdev_disk.c        |    7 +-
 sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c  |   70 +
 .../openzfs/module/os/linux/zfs/zfs_ctldir.c       |    4 +-
 .../openzfs/module/os/linux/zfs/zfs_ioctl_os.c     |   65 +-
 .../openzfs/module/os/linux/zfs/zfs_sysfs.c        |   49 +-
 sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c  |    4 +-
 .../openzfs/module/os/linux/zfs/zfs_vnops_os.c     |   58 +-
 .../openzfs/module/os/linux/zfs/zfs_znode.c        |    8 +
 sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c |   97 +-
 sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c  |   24 +-
 sys/contrib/openzfs/module/spl/Makefile.in         |   13 -
 sys/contrib/openzfs/module/unicode/Makefile.in     |   11 -
 sys/contrib/openzfs/module/unicode/u8_textprep.c   |   21 -
 sys/contrib/openzfs/module/zcommon/Makefile.in     |   28 -
 .../openzfs/module/zcommon/zfeature_common.c       |    7 +
 sys/contrib/openzfs/module/zcommon/zfs_prop.c      |   14 +-
 sys/contrib/openzfs/module/zcommon/zprop_common.c  |    4 +-
 sys/contrib/openzfs/module/zfs/Makefile.in         |  158 --
 sys/contrib/openzfs/module/zfs/arc.c               |   47 +-
 sys/contrib/openzfs/module/zfs/dbuf.c              |   28 +-
 sys/contrib/openzfs/module/zfs/dbuf_stats.c        |    4 +-
 sys/contrib/openzfs/module/zfs/dmu.c               |    2 +-
 sys/contrib/openzfs/module/zfs/dsl_dataset.c       |   65 +-
 sys/contrib/openzfs/module/zfs/dsl_destroy.c       |    3 +
 sys/contrib/openzfs/module/zfs/metaslab.c          |  141 +-
 sys/contrib/openzfs/module/zfs/sa.c                |    4 +-
 sys/contrib/openzfs/module/zfs/spa.c               |    2 +-
 sys/contrib/openzfs/module/zfs/spa_errlog.c        |  910 ++++++++-
 sys/contrib/openzfs/module/zfs/spa_log_spacemap.c  |  231 ++-
 sys/contrib/openzfs/module/zfs/vdev.c              |    7 -
 sys/contrib/openzfs/module/zfs/vdev_removal.c      |    5 -
 sys/contrib/openzfs/module/zfs/zfeature.c          |    7 +
 sys/contrib/openzfs/module/zfs/zfs_ioctl.c         |    2 +-
 sys/contrib/openzfs/module/zfs/zfs_vnops.c         |    8 +-
 sys/contrib/openzfs/module/zfs/zio.c               |    9 -
 sys/contrib/openzfs/module/zfs/zvol.c              |    1 +
 sys/contrib/openzfs/module/zstd/Makefile.in        |   69 -
 sys/contrib/openzfs/module/zstd/README.md          |   13 +-
 .../module/zstd/include/zstd_compat_wrapper.h      |    2 +-
 .../module/zstd/lib/compress/fse_compress.c        |    2 +-
 .../zstd/lib/compress/zstd_compress_superblock.c   |    2 +-
 sys/contrib/openzfs/module/zstd/zfs_zstd.c         |   14 +-
 sys/contrib/openzfs/rpm/.gitignore                 |    1 +
 sys/contrib/openzfs/rpm/Makefile.am                |    9 +-
 sys/contrib/openzfs/rpm/generic/.gitignore         |    3 -
 sys/contrib/openzfs/rpm/generic/Makefile.am        |    1 -
 sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in   |    2 +-
 sys/contrib/openzfs/rpm/generic/zfs.spec.in        |    2 +
 sys/contrib/openzfs/rpm/redhat/.gitignore          |    3 -
 sys/contrib/openzfs/rpm/redhat/Makefile.am         |    1 -
 sys/contrib/openzfs/rpm/redhat/zfs-kmod.spec.in    |    3 +-
 sys/contrib/openzfs/scripts/Makefile.am            |  141 +-
 sys/contrib/openzfs/scripts/cstyle.pl              |   73 +-
 sys/contrib/openzfs/scripts/dkms.mkconf            |   40 +-
 sys/contrib/openzfs/scripts/kmodtool               |    9 -
 sys/contrib/openzfs/scripts/zfs-helpers.sh         |   49 +-
 sys/contrib/openzfs/scripts/zfs-tests.sh           |  135 +-
 sys/contrib/openzfs/scripts/zfs.sh                 |  120 +-
 sys/contrib/openzfs/scripts/zfs2zol-patch.sed      |    2 +-
 sys/contrib/openzfs/scripts/zimport.sh             |    4 +-
 sys/contrib/openzfs/scripts/zloop.sh               |   22 +-
 sys/contrib/openzfs/tests/Makefile.am              |   32 +-
 sys/contrib/openzfs/tests/README.md                |    4 +
 sys/contrib/openzfs/tests/runfiles/Makefile.am     |    9 -
 sys/contrib/openzfs/tests/runfiles/common.run      |   17 +-
 sys/contrib/openzfs/tests/runfiles/linux.run       |    2 +-
 sys/contrib/openzfs/tests/runfiles/sanity.run      |    6 +-
 sys/contrib/openzfs/tests/test-runner/Makefile.am  |    1 -
 .../openzfs/tests/test-runner/bin/Makefile.am      |    8 -
 .../tests/test-runner/bin/test-runner.py.in        |    6 +-
 .../openzfs/tests/test-runner/bin/zts-report.py.in |  133 +-
 .../openzfs/tests/test-runner/include/Makefile.am  |    5 -
 .../openzfs/tests/test-runner/include/logapi.shlib |  126 +-
 .../openzfs/tests/test-runner/include/stf.shlib    |   57 -
 .../openzfs/tests/test-runner/man/Makefile.am      |    4 -
 sys/contrib/openzfs/tests/zfs-tests/.gitignore     |    1 +
 sys/contrib/openzfs/tests/zfs-tests/Makefile.am    |   49 +-
 .../openzfs/tests/zfs-tests/callbacks/Makefile.am  |    6 -
 sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore |   47 +
 .../openzfs/tests/zfs-tests/cmd/Makefile.am        |  162 +-
 .../tests/zfs-tests/cmd/{badsend => }/badsend.c    |    0
 .../openzfs/tests/zfs-tests/cmd/badsend/.gitignore |    1 -
 .../tests/zfs-tests/cmd/badsend/Makefile.am        |   11 -
 .../zfs-tests/cmd/{btree_test => }/btree_test.c    |    0
 .../tests/zfs-tests/cmd/btree_test/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/btree_test/Makefile.am     |   32 -
 .../functional => cmd}/checksum/edonr_test.c       |    0
 .../{tests/functional => cmd}/checksum/sha2_test.c |    0
 .../functional => cmd}/checksum/skein_test.c       |    0
 .../cmd/{chg_usr_exec => }/chg_usr_exec.c          |    0
 .../tests/zfs-tests/cmd/chg_usr_exec/.gitignore    |    1 -
 .../tests/zfs-tests/cmd/chg_usr_exec/Makefile.am   |    6 -
 .../{tests/functional/cp_files => cmd}/cp_files.c  |    0
 .../{tests/functional/ctime => cmd}/ctime.c        |    0
 .../cmd/{devname2devid => }/devname2devid.c        |    0
 .../tests/zfs-tests/cmd/devname2devid/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/devname2devid/Makefile.am  |   10 -
 .../cmd/{dir_rd_update => }/dir_rd_update.c        |    0
 .../tests/zfs-tests/cmd/dir_rd_update/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/dir_rd_update/Makefile.am  |    6 -
 .../acl/off => cmd}/dosmode_readonly_write.c       |    0
 .../tests/zfs-tests/cmd/{draid => }/draid.c        |    7 +-
 .../openzfs/tests/zfs-tests/cmd/draid/.gitignore   |    1 -
 .../openzfs/tests/zfs-tests/cmd/draid/Makefile.am  |   15 -
 .../cli_root/zpool_events => cmd}/ereports.c       |    2 +-
 .../openzfs/tests/zfs-tests/cmd/file/file_append.c |  206 +++
 .../cmd/{file_check => file}/file_check.c          |    2 +-
 .../tests/zfs-tests/cmd/{ => file}/file_common.h   |    0
 .../cmd/{file_trunc => file}/file_trunc.c          |    0
 .../cmd/{file_write => file}/file_write.c          |    4 +-
 .../cmd/{largest_file => file}/largest_file.c      |    2 +-
 .../cmd/{randfree_file => file}/randfree_file.c    |    2 +-
 .../cmd/{randwritecomp => file}/randwritecomp.c    |    2 +-
 .../tests/zfs-tests/cmd/file_check/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/file_check/Makefile.am     |    6 -
 .../tests/zfs-tests/cmd/file_trunc/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/file_trunc/Makefile.am     |    6 -
 .../tests/zfs-tests/cmd/file_write/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/file_write/Makefile.am     |    6 -
 .../tests/zfs-tests/cmd/{get_diff => }/get_diff.c  |    0
 .../tests/zfs-tests/cmd/get_diff/.gitignore        |    1 -
 .../tests/zfs-tests/cmd/get_diff/Makefile.am       |    6 -
 .../zfs-tests/cmd/{getversion => }/getversion.c    |    0
 .../tests/zfs-tests/cmd/getversion/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/getversion/Makefile.am     |    6 -
 .../tests/zfs-tests/cmd/largest_file/.gitignore    |    1 -
 .../tests/zfs-tests/cmd/largest_file/Makefile.am   |    6 -
 .../{libzfs_input_check => }/libzfs_input_check.c  |    0
 .../zfs-tests/cmd/libzfs_input_check/.gitignore    |    1 -
 .../zfs-tests/cmd/libzfs_input_check/Makefile.am   |   17 -
 .../cmd/linux_dos_attributes/dos_attributes.h      |   82 +
 .../cmd/linux_dos_attributes/read_dos_attributes.c |   60 +
 .../linux_dos_attributes/write_dos_attributes.c    |   95 +
 .../tests/zfs-tests/cmd/{mkbusy => }/mkbusy.c      |    0
 .../openzfs/tests/zfs-tests/cmd/mkbusy/.gitignore  |    1 -
 .../openzfs/tests/zfs-tests/cmd/mkbusy/Makefile.am |    6 -
 .../tests/zfs-tests/cmd/{mkfile => }/mkfile.c      |    0
 .../openzfs/tests/zfs-tests/cmd/mkfile/.gitignore  |    1 -
 .../openzfs/tests/zfs-tests/cmd/mkfile/Makefile.am |    8 -
 .../tests/zfs-tests/cmd/{mkfiles => }/mkfiles.c    |    0
 .../openzfs/tests/zfs-tests/cmd/mkfiles/.gitignore |    1 -
 .../tests/zfs-tests/cmd/mkfiles/Makefile.am        |    6 -
 .../tests/zfs-tests/cmd/{mktree => }/mktree.c      |    0
 .../openzfs/tests/zfs-tests/cmd/mktree/.gitignore  |    1 -
 .../openzfs/tests/zfs-tests/cmd/mktree/Makefile.am |    6 -
 .../zfs-tests/cmd/{mmap_exec => }/mmap_exec.c      |    0
 .../tests/zfs-tests/cmd/mmap_exec/.gitignore       |    1 -
 .../tests/zfs-tests/cmd/mmap_exec/Makefile.am      |    6 -
 .../zfs-tests/cmd/{mmap_libaio => }/mmap_libaio.c  |    0
 .../tests/zfs-tests/cmd/mmap_libaio/.gitignore     |    1 -
 .../tests/zfs-tests/cmd/mmap_libaio/Makefile.am    |   10 -
 .../zfs-tests/cmd/{mmap_seek => }/mmap_seek.c      |    0
 .../tests/zfs-tests/cmd/mmap_seek/.gitignore       |    1 -
 .../tests/zfs-tests/cmd/mmap_seek/Makefile.am      |    6 -
 .../openzfs/tests/zfs-tests/cmd/mmap_sync.c        |  152 ++
 .../zfs-tests/cmd/{mmapwrite => }/mmapwrite.c      |    0
 .../tests/zfs-tests/cmd/mmapwrite/.gitignore       |    1 -
 .../tests/zfs-tests/cmd/mmapwrite/Makefile.am      |    7 -
 .../cmd/{nvlist_to_lua => }/nvlist_to_lua.c        |    0
 .../tests/zfs-tests/cmd/nvlist_to_lua/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/nvlist_to_lua/Makefile.am  |   10 -
 .../tests/zfs-tests/cmd/randfree_file/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/randfree_file/Makefile.am  |    6 -
 .../tests/zfs-tests/cmd/randwritecomp/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/randwritecomp/Makefile.am  |    9 -
 .../zfs-tests/cmd/read_dos_attributes/.gitignore   |    1 -
 .../zfs-tests/cmd/read_dos_attributes/Makefile.am  |    6 -
 .../cmd/read_dos_attributes/read_dos_attributes.c  |  167 --
 .../tests/zfs-tests/cmd/{readmmap => }/readmmap.c  |    0
 .../tests/zfs-tests/cmd/readmmap/.gitignore        |    1 -
 .../tests/zfs-tests/cmd/readmmap/Makefile.am       |    6 -
 .../zfs-tests/cmd/{rename_dir => }/rename_dir.c    |    0
 .../tests/zfs-tests/cmd/rename_dir/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/rename_dir/Makefile.am     |    6 -
 .../rm_lnkcnt_zero_file.c                          |    0
 .../zfs-tests/cmd/rm_lnkcnt_zero_file/.gitignore   |    1 -
 .../zfs-tests/cmd/rm_lnkcnt_zero_file/Makefile.am  |    7 -
 .../zfs-tests/cmd/{send_doall => }/send_doall.c    |    0
 .../tests/zfs-tests/cmd/send_doall/.gitignore      |    1 -
 .../tests/zfs-tests/cmd/send_doall/Makefile.am     |   11 -
 .../zfs-tests/cmd/{stride_dd => }/stride_dd.c      |    0
 .../tests/zfs-tests/cmd/stride_dd/.gitignore       |    1 -
 .../tests/zfs-tests/cmd/stride_dd/Makefile.am      |    7 -
 .../functional/suid => cmd}/suid_write_to_file.c   |    0
 .../cmd/{threadsappend => }/threadsappend.c        |    0
 .../tests/zfs-tests/cmd/threadsappend/.gitignore   |    1 -
 .../tests/zfs-tests/cmd/threadsappend/Makefile.am  |    7 -
 .../functional/truncate => cmd}/truncate_test.c    |    0
 .../cmd/{user_ns_exec => }/user_ns_exec.c          |    0
 .../tests/zfs-tests/cmd/user_ns_exec/.gitignore    |    1 -
 .../tests/zfs-tests/cmd/user_ns_exec/Makefile.am   |    6 -
 .../zfs-tests/cmd/write_dos_attributes/.gitignore  |    1 -
 .../zfs-tests/cmd/write_dos_attributes/Makefile.am |    6 -
 .../write_dos_attributes/write_dos_attributes.c    |  201 --
 .../zfs-tests/cmd/{xattrtest => }/xattrtest.c      |    0
 .../tests/zfs-tests/cmd/xattrtest/.gitignore       |    1 -
 .../tests/zfs-tests/cmd/xattrtest/Makefile.am      |    6 -
 .../events => cmd}/zed_fd_spill-zedlet.c           |    0
 .../zfs_diff/socket.c => cmd/zfs_diff-socket.c}    |    0
 .../openzfs/tests/zfs-tests/include/Makefile.am    |   14 -
 .../openzfs/tests/zfs-tests/include/blkdev.shlib   |  119 +-
 .../openzfs/tests/zfs-tests/include/commands.cfg   |   46 +-
 .../openzfs/tests/zfs-tests/include/default.cfg.in |    6 +-
 .../openzfs/tests/zfs-tests/include/libtest.shlib  | 1301 ++++---------
 .../openzfs/tests/zfs-tests/include/math.shlib     |   11 +-
 .../tests/zfs-tests/include/properties.shlib       |   30 +-
 .../tests/zfs-tests/include/zpool_script.shlib     |    8 +-
 .../openzfs/tests/zfs-tests/tests/Makefile.am      | 1955 +++++++++++++++++++-
 .../tests/zfs-tests/tests/functional/Makefile.am   |   95 -
 .../zfs-tests/tests/functional/acl/Makefile.am     |    6 -
 .../tests/functional/acl/acl_common.kshlib         |  385 +---
 .../zfs-tests/tests/functional/acl/off/.gitignore  |    1 -
 .../zfs-tests/tests/functional/acl/off/Makefile.am |   14 -
 .../zfs-tests/tests/functional/acl/off/dosmode.ksh |   11 +-
 .../tests/functional/acl/posix-sa/Makefile.am      |    8 -
 .../tests/functional/acl/posix/Makefile.am         |    8 -
 .../tests/functional/acl/posix/posix_001_pos.ksh   |   68 +-
 .../tests/functional/acl/posix/posix_002_pos.ksh   |   11 +-
 .../tests/functional/acl/posix/posix_003_pos.ksh   |   12 +-
 .../tests/functional/alloc_class/Makefile.am       |   21 -
 .../functional/alloc_class/alloc_class_004_pos.ksh |    3 +-
 .../functional/alloc_class/alloc_class_005_pos.ksh |    4 +-
 .../functional/alloc_class/alloc_class_010_pos.ksh |    2 +-
 .../functional/alloc_class/alloc_class_011_neg.ksh |    2 +-
 .../{threadsappend => append}/cleanup.ksh          |    9 +-
 .../tests/functional/append/file_append.ksh        |   73 +
 .../functional/{threadsappend => append}/setup.ksh |    7 +-
 .../threadsappend_001_pos.ksh                      |    0
 .../zfs-tests/tests/functional/arc/Makefile.am     |    8 -
 .../tests/functional/arc/dbufstats_001_pos.ksh     |    3 +-
 .../tests/zfs-tests/tests/functional/arc/setup.ksh |    2 +
 .../zfs-tests/tests/functional/atime/Makefile.am   |   14 -
 .../zfs-tests/tests/functional/bootfs/Makefile.am  |   12 -
 .../tests/functional/bootfs/bootfs_001_pos.ksh     |    6 -
 .../tests/functional/bootfs/bootfs_002_neg.ksh     |    6 -
 .../tests/functional/bootfs/bootfs_003_pos.ksh     |    8 +-
 .../tests/functional/bootfs/bootfs_004_neg.ksh     |    6 -
 .../tests/functional/bootfs/bootfs_006_pos.ksh     |   10 +-
 .../zfs-tests/tests/functional/btree/Makefile.am   |   20 -
 .../tests/functional/btree/btree_negative.ksh      |    7 +-
 .../zfs-tests/tests/functional/cache/Makefile.am   |   20 -
 .../zfs-tests/tests/functional/cache/cache.kshlib  |    8 +-
 .../tests/functional/cache/cache_012_pos.ksh       |    2 +
 .../tests/functional/cachefile/Makefile.am         |   12 -
 .../tests/functional/cachefile/cachefile.cfg       |    2 +-
 .../tests/functional/casenorm/Makefile.am          |   25 -
 .../tests/functional/casenorm/casenorm.kshlib      |   14 +-
 .../functional/casenorm/mixed_create_failure.ksh   |   22 +-
 .../tests/functional/channel_program/Makefile.am   |    6 -
 .../channel_program/channel_common.kshlib          |   35 +-
 .../channel_program/lua_core/Makefile.am           |   46 -
 .../channel_program/lua_core/tst.exists.ksh        |    4 +-
 .../lua_core/tst.integer_illegal.ksh               |    4 +-
 .../lua_core/tst.integer_overflow.ksh              |    4 +-
 .../lua_core/tst.language_functions_neg.ksh        |    4 +-
 .../lua_core/tst.language_functions_pos.ksh        |    4 +-
 .../channel_program/lua_core/tst.return_large.ksh  |    3 +-
 .../lua_core/tst.return_nvlist_neg.ksh             |    8 +-
 .../lua_core/tst.return_nvlist_pos.ksh             |    8 +-
 .../channel_program/lua_core/tst.timeout.ksh       |   14 +-
 .../channel_program/synctask_core/Makefile.am      |   53 -
 .../synctask_core/tst.terminate_by_signal.ksh      |   13 +-
 .../zfs-tests/tests/functional/chattr/Makefile.am  |    6 -
 .../zfs-tests/tests/functional/chattr/setup.ksh    |    4 +-
 .../zfs-tests/tests/functional/checksum/.gitignore |    4 -
 .../tests/functional/checksum/Makefile.am          |   31 -
 .../tests/functional/checksum/filetest_001_pos.ksh |    5 +-
 .../tests/functional/checksum/run_edonr_test.ksh   |    2 +-
 .../tests/functional/checksum/run_sha2_test.ksh    |    2 +-
 .../tests/functional/checksum/run_skein_test.ksh   |    2 +-
 .../tests/functional/clean_mirror/Makefile.am      |   12 -
 .../tests/functional/cli_root/Makefile.am          |   67 -
 .../tests/functional/cli_root/cli_common.kshlib    |   14 +-
 .../tests/functional/cli_root/zdb/Makefile.am      |   20 -
 .../tests/functional/cli_root/zdb/zdb_003_pos.ksh  |    4 +-
 .../tests/functional/cli_root/zdb/zdb_004_pos.ksh  |    6 +-
 .../tests/functional/cli_root/zdb/zdb_args_pos.ksh |    8 +-
 .../cli_root/zdb/zdb_block_size_histogram.ksh      |    9 +-
 .../tests/functional/cli_root/zdb/zdb_checksum.ksh |    6 +-
 .../functional/cli_root/zdb/zdb_decompress.ksh     |   16 +-
 .../cli_root/zdb/zdb_decompress_zstd.ksh           |   30 +-
 .../functional/cli_root/zdb/zdb_display_block.ksh  |   14 +-
 .../cli_root/zdb/zdb_object_range_neg.ksh          |    2 +-
 .../cli_root/zdb/zdb_object_range_pos.ksh          |    9 +-
 .../functional/cli_root/zdb/zdb_objset_id.ksh      |   56 +-
 .../functional/cli_root/zdb/zdb_recover_2.ksh      |    2 +-
 .../tests/functional/cli_root/zfs/Makefile.am      |    7 -
 .../tests/functional/cli_root/zfs/zfs_002_pos.ksh  |   44 +-
 .../tests/functional/cli_root/zfs/zfs_003_neg.ksh  |   14 +-
 .../functional/cli_root/zfs_bookmark/Makefile.am   |    5 -
 .../cli_root/zfs_bookmark/zfs_bookmark_cliargs.ksh |    2 +
 .../functional/cli_root/zfs_change-key/Makefile.am |   12 -
 .../functional/cli_root/zfs_clone/Makefile.am      |   17 -
 .../cli_root/zfs_clone/zfs_clone_003_pos.ksh       |    1 +
 .../cli_root/zfs_clone/zfs_clone_007_pos.ksh       |    3 +-
 .../cli_root/zfs_clone/zfs_clone_010_pos.ksh       |    2 +-
 .../functional/cli_root/zfs_copies/Makefile.am     |   14 -
 .../cli_root/zfs_copies/zfs_copies_002_pos.ksh     |    6 +-
 .../functional/cli_root/zfs_create/Makefile.am     |   28 -
 .../cli_root/zfs_create/zfs_create_002_pos.ksh     |    3 +-
 .../cli_root/zfs_create/zfs_create_004_pos.ksh     |   15 +-
 .../cli_root/zfs_create/zfs_create_005_pos.ksh     |   17 +-
 .../cli_root/zfs_create/zfs_create_008_neg.ksh     |    2 +-
 .../cli_root/zfs_create/zfs_create_009_neg.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_010_neg.ksh     |    5 +-
 .../cli_root/zfs_create/zfs_create_012_pos.ksh     |    3 +-
 .../cli_root/zfs_create/zfs_create_013_pos.ksh     |    3 +-
 .../cli_root/zfs_create/zfs_create_common.kshlib   |   13 +-
 .../cli_root/zfs_create/zfs_create_dryrun.ksh      |    7 +-
 .../cli_root/zfs_create/zfs_create_nomount.ksh     |    2 +-
 .../cli_root/zfs_create/zfs_create_verbose.ksh     |    7 +-
 .../functional/cli_root/zfs_destroy/Makefile.am    |   30 -
 .../cli_root/zfs_destroy/zfs_destroy_004_pos.ksh   |    3 +-
 .../tests/functional/cli_root/zfs_diff/.gitignore  |    1 -
 .../tests/functional/cli_root/zfs_diff/Makefile.am |   18 -
 .../cli_root/zfs_diff/zfs_diff_changes.ksh         |    2 +-
 .../cli_root/zfs_diff/zfs_diff_timestamp.ksh       |    4 +-
 .../cli_root/zfs_diff/zfs_diff_types.ksh           |   10 +-
 .../tests/functional/cli_root/zfs_get/Makefile.am  |   18 -
 .../cli_root/zfs_get/zfs_get_001_pos.ksh           |    7 +-
 .../cli_root/zfs_get/zfs_get_002_pos.ksh           |    2 +-
 .../cli_root/zfs_get/zfs_get_003_pos.ksh           |    5 +-
 .../cli_root/zfs_get/zfs_get_004_pos.ksh           |    9 +-
 .../cli_root/zfs_get/zfs_get_005_neg.ksh           |    4 +-
 .../cli_root/zfs_get/zfs_get_008_pos.ksh           |    7 +-
 .../cli_root/zfs_get/zfs_get_009_pos.ksh           |   11 +-
 .../cli_root/zfs_ids_to_path/Makefile.am           |    5 -
 .../functional/cli_root/zfs_inherit/Makefile.am    |    8 -
 .../cli_root/zfs_inherit/zfs_inherit_001_neg.ksh   |    9 +-
 .../tests/functional/cli_root/zfs_jail/Makefile.am |    6 -
 .../functional/cli_root/zfs_load-key/Makefile.am   |   18 -
 .../cli_root/zfs_load-key/zfs_load-key.ksh         |    3 +-
 .../cli_root/zfs_load-key/zfs_load-key_all.ksh     |    3 +-
 .../zfs_load-key/zfs_load-key_common.kshlib        |    3 +-
 .../functional/cli_root/zfs_mount/Makefile.am      |   29 -
 .../functional/cli_root/zfs_mount/zfs_mount.kshlib |    5 +-
 .../cli_root/zfs_mount/zfs_mount_005_pos.ksh       |   11 +-
 .../cli_root/zfs_mount/zfs_mount_007_pos.ksh       |    5 +-
 .../cli_root/zfs_mount/zfs_multi_mount.ksh         |    4 +-
 .../functional/cli_root/zfs_program/Makefile.am    |    5 -
 .../functional/cli_root/zfs_promote/Makefile.am    |   16 -
 .../functional/cli_root/zfs_property/Makefile.am   |    5 -
 .../zfs_property/zfs_written_property_001_pos.ksh  |    5 +-
 .../functional/cli_root/zfs_receive/Makefile.am    |   34 -
 .../cli_root/zfs_receive/zfs_receive_001_pos.ksh   |    5 +-
 .../cli_root/zfs_receive/zfs_receive_003_pos.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_005_neg.ksh   |    4 +-
 .../cli_root/zfs_receive/zfs_receive_006_pos.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_007_neg.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_008_pos.ksh   |    3 -
 .../cli_root/zfs_receive/zfs_receive_009_neg.ksh   |    7 +-
 .../cli_root/zfs_receive/zfs_receive_010_pos.ksh   |   13 +-
 .../cli_root/zfs_receive/zfs_receive_013_pos.ksh   |    2 +-
 .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh |   28 +-
 .../cli_root/zfs_receive/zfs_receive_new_props.ksh |    4 +-
 .../functional/cli_root/zfs_rename/Makefile.am     |   26 -
 .../functional/cli_root/zfs_rename/cleanup.ksh     |    8 +-
 .../tests/functional/cli_root/zfs_rename/setup.ksh |    9 +-
 .../cli_root/zfs_rename/zfs_rename.kshlib          |    7 +-
 .../cli_root/zfs_rename/zfs_rename_014_neg.ksh     |    6 +-
 .../cli_root/zfs_rename/zfs_rename_nounmount.ksh   |   11 +-
 .../cli_root/zfs_reservation/Makefile.am           |    6 -
 .../zfs_reservation/zfs_reservation_002_pos.ksh    |   12 +-
 .../functional/cli_root/zfs_rollback/Makefile.am   |   12 -
 .../zfs_rollback/zfs_rollback_common.kshlib        |   21 +-
 .../tests/functional/cli_root/zfs_send/Makefile.am |   20 -
 .../cli_root/zfs_send/zfs_send_001_pos.ksh         |    8 +-
 .../cli_root/zfs_send/zfs_send_002_pos.ksh         |    8 +-
 .../cli_root/zfs_send/zfs_send_006_pos.ksh         |    4 +-
 .../cli_root/zfs_send/zfs_send_007_pos.ksh         |    9 +-
 .../tests/functional/cli_root/zfs_set/Makefile.am  |   35 -
 .../cli_root/zfs_set/canmount_001_pos.ksh          |   10 +-
 .../cli_root/zfs_set/canmount_002_pos.ksh          |   10 +-
 .../cli_root/zfs_set/canmount_003_pos.ksh          |    4 +-
 .../cli_root/zfs_set/mountpoint_001_pos.ksh        |    4 -
 .../cli_root/zfs_set/mountpoint_002_pos.ksh        |    4 -
 .../cli_root/zfs_set/mountpoint_003_pos.ksh        |    9 +-
 .../cli_root/zfs_set/property_alias_001_pos.ksh    |    8 +-
 .../cli_root/zfs_set/reservation_001_neg.ksh       |   10 +-
 .../cli_root/zfs_set/ro_props_001_pos.ksh          |    7 +-
 .../cli_root/zfs_set/snapdir_001_pos.ksh           |   25 +-
 .../cli_root/zfs_set/user_property_004_pos.ksh     |   23 +-
 .../cli_root/zfs_set/version_001_neg.ksh           |    6 +-
 .../cli_root/zfs_set/zfs_set_001_neg.ksh           |    6 +-
 .../cli_root/zfs_set/zfs_set_common.kshlib         |   73 +-
 .../functional/cli_root/zfs_share/Makefile.am      |   21 -
 .../cli_root/zfs_share/zfs_share_005_pos.ksh       |    9 +-
 .../cli_root/zfs_share/zfs_share_007_neg.ksh       |    5 +-
 .../cli_root/zfs_share/zfs_share_009_neg.ksh       |    3 +-
 .../cli_root/zfs_share/zfs_share_011_pos.ksh       |   14 +-
 .../cli_root/zfs_share/zfs_share_013_pos.ksh       |   24 +-
 .../zfs_share/zfs_share_concurrent_shares.ksh      |  133 +-
 .../functional/cli_root/zfs_snapshot/Makefile.am   |   16 -
 .../cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh |    6 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh |    4 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh |    7 +-
 .../cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh |    8 +-
 .../functional/cli_root/zfs_sysfs/Makefile.am      |   10 -
 .../functional/cli_root/zfs_unload-key/Makefile.am |    7 -
 .../cli_root/zfs_unload-key/zfs_unload-key_all.ksh |    3 +-
 .../functional/cli_root/zfs_unmount/Makefile.am    |   20 -
 .../cli_root/zfs_unmount/zfs_unmount.kshlib        |    2 +-
 .../cli_root/zfs_unmount/zfs_unmount_006_pos.ksh   |    1 -
 .../functional/cli_root/zfs_unshare/Makefile.am    |   11 -
 .../functional/cli_root/zfs_unshare/setup.ksh      |   40 +-
 .../cli_root/zfs_unshare/zfs_unshare_001_pos.ksh   |    4 +-
 .../cli_root/zfs_unshare/zfs_unshare_002_pos.ksh   |    3 +-
 .../cli_root/zfs_unshare/zfs_unshare_006_pos.ksh   |   23 +-
 .../cli_root/zfs_unshare/zfs_unshare_008_pos.ksh   |   58 +
 .../functional/cli_root/zfs_upgrade/Makefile.am    |   14 -
 .../cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh   |   20 +-
 .../cli_root/zfs_upgrade/zfs_upgrade_002_pos.ksh   |    6 +-
 .../tests/functional/cli_root/zfs_wait/Makefile.am |    9 -
 .../tests/functional/cli_root/zhack/Makefile.am    |    3 -
 .../tests/functional/cli_root/zpool/Makefile.am    |    8 -
 .../functional/cli_root/zpool/zpool_002_pos.ksh    |   39 +-
 .../functional/cli_root/zpool/zpool_003_pos.ksh    |   39 +-
 .../functional/cli_root/zpool/zpool_colors.ksh     |   16 +-
 .../functional/cli_root/zpool_add/Makefile.am      |   22 -
 .../functional/cli_root/zpool_add/add-o_ashift.ksh |   16 +-
 .../zpool_add/add_nested_replacing_spare.ksh       |    4 +-
 .../cli_root/zpool_add/add_prop_ashift.ksh         |   16 +-
 .../functional/cli_root/zpool_add/zpool_add.kshlib |   12 +-
 .../cli_root/zpool_add/zpool_add_003_pos.ksh       |    6 +-
 .../functional/cli_root/zpool_attach/Makefile.am   |    6 -
 .../cli_root/zpool_attach/attach-o_ashift.ksh      |   15 +-
 .../functional/cli_root/zpool_clear/Makefile.am    |   11 -
 .../cli_root/zpool_clear/zpool_clear_001_pos.ksh   |   99 +-
 .../functional/cli_root/zpool_create/Makefile.am   |   50 -
 .../cli_root/zpool_create/create-o_ashift.ksh      |   12 +-
 .../cli_root/zpool_create/zpool_create.shlib       |    7 +-
 .../cli_root/zpool_create/zpool_create_005_pos.ksh |    4 +-
 .../cli_root/zpool_create/zpool_create_012_neg.ksh |    7 +-
 .../cli_root/zpool_create/zpool_create_016_pos.ksh |    8 +-
 .../cli_root/zpool_create/zpool_create_020_pos.ksh |   15 +-
 .../cli_root/zpool_create/zpool_create_021_pos.ksh |   16 +-
 .../cli_root/zpool_create/zpool_create_022_pos.ksh |   15 +-
 .../cli_root/zpool_create/zpool_create_023_neg.ksh |    2 +-
 .../cli_root/zpool_create/zpool_create_024_pos.ksh |   25 +-
 .../zpool_create/zpool_create_tempname.ksh         |    6 +-
 .../functional/cli_root/zpool_destroy/Makefile.am  |    8 -
 .../cli_root/zpool_destroy/zpool_destroy.cfg       |    2 +-
 .../functional/cli_root/zpool_detach/Makefile.am   |    5 -
 .../functional/cli_root/zpool_events/.gitignore    |    1 -
 .../functional/cli_root/zpool_events/Makefile.am   |   26 -
 .../zpool_events/zpool_events_clear_retained.ksh   |   11 +-
 .../cli_root/zpool_events/zpool_events_cliargs.ksh |    2 +-
 .../zpool_events/zpool_events_duplicates.ksh       |    9 +-
 .../cli_root/zpool_events/zpool_events_errors.ksh  |    4 +-
 .../cli_root/zpool_events/zpool_events_follow.ksh  |    4 +-
 .../zpool_events/zpool_events_poolname.ksh         |   13 +-
 .../functional/cli_root/zpool_expand/Makefile.am   |   12 -
 .../cli_root/zpool_expand/zpool_expand_001_pos.ksh |   21 +-
 .../cli_root/zpool_expand/zpool_expand_002_pos.ksh |   29 +-
 .../cli_root/zpool_expand/zpool_expand_003_neg.ksh |   29 +-
 .../functional/cli_root/zpool_export/Makefile.am   |   12 -
 .../cli_root/zpool_export/zpool_export.cfg         |    6 +-
 .../cli_root/zpool_export/zpool_export_002_pos.ksh |   17 +-
 .../functional/cli_root/zpool_get/Makefile.am      |   12 -
 .../functional/cli_root/zpool_get/zpool_get.cfg    |    3 +-
 .../cli_root/zpool_get/zpool_get_002_pos.ksh       |   15 +-
 .../cli_root/zpool_get/zpool_get_003_pos.ksh       |   10 +-
 .../cli_root/zpool_get/zpool_get_005_pos.ksh       |    9 +-
 .../functional/cli_root/zpool_history/Makefile.am  |    6 -
 .../functional/cli_root/zpool_import/Makefile.am   |   51 -
 .../cli_root/zpool_import/blockfiles/Makefile.am   |    5 -
 .../import_cachefile_shared_device.ksh             |    8 +-
 .../zpool_import/import_rewind_config_changed.ksh  |    8 +-
 .../cli_root/zpool_import/zpool_import.kshlib      |   61 +-
 .../cli_root/zpool_import/zpool_import_001_pos.ksh |    9 +-
 .../cli_root/zpool_import/zpool_import_002_pos.ksh |    7 +-
 .../cli_root/zpool_import/zpool_import_012_pos.ksh |    7 +-
 .../zpool_import/zpool_import_all_001_pos.ksh      |   11 +-
 .../cli_root/zpool_import/zpool_import_errata3.ksh |    8 +-
 .../cli_root/zpool_import/zpool_import_errata4.ksh |   18 +-
 .../zpool_import/zpool_import_features_002_neg.ksh |    6 +-
 .../zpool_import/zpool_import_missing_001_pos.ksh  |    8 +-
 .../zpool_import/zpool_import_missing_003_pos.ksh  |   13 +-
 .../zpool_import/zpool_import_rename_001_pos.ksh   |    7 +-
 .../cli_root/zpool_initialize/Makefile.am          |   18 -
 .../zpool_initialize_verify_initialized.ksh        |    7 +-
 .../cli_root/zpool_labelclear/Makefile.am          |    9 -
 .../functional/cli_root/zpool_offline/Makefile.am  |    7 -
 .../zpool_offline/zpool_offline_001_pos.ksh        |   25 +-
 .../zpool_offline/zpool_offline_003_pos.ksh        |    5 +-
 .../functional/cli_root/zpool_online/Makefile.am   |    6 -
 .../cli_root/zpool_online/zpool_online_001_pos.ksh |   20 +-
 .../functional/cli_root/zpool_remove/Makefile.am   |   10 -
 .../functional/cli_root/zpool_reopen/Makefile.am   |   15 -
 .../cli_root/zpool_reopen/zpool_reopen.cfg         |    7 +-
 .../cli_root/zpool_reopen/zpool_reopen.shlib       |   13 +-
 .../functional/cli_root/zpool_replace/Makefile.am  |    7 -
 .../cli_root/zpool_replace/replace-o_ashift.ksh    |   14 +-
 .../cli_root/zpool_replace/replace_prop_ashift.ksh |   14 +-
 .../functional/cli_root/zpool_resilver/Makefile.am |    9 -
 .../cli_root/zpool_resilver/zpool_resilver.cfg     |    5 +-
 .../functional/cli_root/zpool_scrub/Makefile.am    |   16 -
 .../cli_root/zpool_scrub/zpool_scrub.cfg           |    4 +-
 .../functional/cli_root/zpool_set/Makefile.am      |    9 -
 .../cli_root/zpool_set/zpool_set_001_pos.ksh       |    2 +-
 .../functional/cli_root/zpool_split/Makefile.am    |   19 -
 .../cli_root/zpool_split/zpool_split.cfg           |    2 +-
 .../cli_root/zpool_split/zpool_split_devices.ksh   |    2 +-
 .../cli_root/zpool_split/zpool_split_indirect.ksh  |    4 +-
 .../cli_root/zpool_split/zpool_split_props.ksh     |    5 +-
 .../cli_root/zpool_split/zpool_split_vdevs.ksh     |    6 +-
 .../cli_root/zpool_split/zpool_split_wholedisk.ksh |    2 +-
 .../functional/cli_root/zpool_status/Makefile.am   |    7 -
 .../cli_root/zpool_status/zpool_status_003_pos.ksh |   70 +
 .../cli_root/zpool_status/zpool_status_004_pos.ksh |   81 +
 .../functional/cli_root/zpool_sync/Makefile.am     |    6 -
 .../functional/cli_root/zpool_trim/Makefile.am     |   25 -
 .../functional/cli_root/zpool_upgrade/Makefile.am  |   20 -
 .../cli_root/zpool_upgrade/blockfiles/Makefile.am  |   54 -
 .../cli_root/zpool_upgrade/zpool_upgrade.kshlib    |    3 +-
 .../zpool_upgrade/zpool_upgrade_008_pos.ksh        |    2 +-
 .../functional/cli_root/zpool_wait/Makefile.am     |   22 -
 .../cli_root/zpool_wait/scan/Makefile.am           |   11 -
 .../cli_root/zpool_wait/zpool_wait.kshlib          |    2 +-
 .../tests/functional/cli_user/Makefile.am          |    6 -
 .../tests/functional/cli_user/misc/Makefile.am     |   52 -
 .../cli_user/misc/arc_summary_001_pos.ksh          |   27 +-
 .../cli_user/misc/arc_summary_002_neg.ksh          |    4 +-
 .../functional/cli_user/misc/arcstat_001_pos.ksh   |    5 +-
 .../tests/functional/cli_user/misc/zdb_001_neg.ksh |   12 +-
 .../tests/functional/cli_user/misc/zfs_001_neg.ksh |    2 +-
 .../functional/cli_user/misc/zfs_allow_001_neg.ksh |   11 +-
 .../functional/cli_user/misc/zfs_share_001_neg.ksh |   11 +-
 .../cli_user/misc/zfs_unallow_001_neg.ksh          |    9 +-
 .../cli_user/misc/zfs_unshare_001_neg.ksh          |   12 +-
 .../functional/cli_user/misc/zpool_001_neg.ksh     |    2 +-
 .../functional/cli_user/misc/zpool_get_001_neg.ksh |    4 +-
 .../functional/cli_user/misc/zpool_set_001_neg.ksh |    2 +-
 .../tests/functional/cli_user/zfs_list/Makefile.am |   15 -
 .../functional/cli_user/zfs_list/zfs_list.kshlib   |    2 +-
 .../cli_user/zfs_list/zfs_list_003_pos.ksh         |    5 +-
 .../cli_user/zfs_list/zfs_list_007_pos.ksh         |    9 +-
 .../functional/cli_user/zpool_iostat/Makefile.am   |   12 -
 .../cli_user/zpool_iostat/zpool_iostat_002_pos.ksh |    2 +-
 .../functional/cli_user/zpool_list/Makefile.am     |    6 -
 .../functional/cli_user/zpool_status/Makefile.am   |    8 -
 .../tests/functional/compression/Makefile.am       |   17 -
 .../functional/compression/compress_001_pos.ksh    |    4 +-
 .../functional/compression/compress_002_pos.ksh    |    4 +-
 .../compression/l2arc_compressed_arc.ksh           |    2 +
 .../compression/l2arc_compressed_arc_disabled.ksh  |    2 +
 .../functional/compression/l2arc_encrypted.ksh     |    2 +
 .../l2arc_encrypted_no_compressed_arc.ksh          |    2 +
 .../zfs-tests/tests/functional/cp_files/.gitignore |    1 -
 .../tests/functional/cp_files/Makefile.am          |   13 -
 .../tests/functional/cp_files/cp_files_001_pos.ksh |    7 +-
 .../zfs-tests/tests/functional/crtime/Makefile.am  |    5 -
 .../zfs-tests/tests/functional/ctime/.gitignore    |    1 -
 .../zfs-tests/tests/functional/ctime/Makefile.am   |   13 -
 .../tests/functional/ctime/ctime_001_pos.ksh       |    2 +-
 .../zfs-tests/tests/functional/deadman/Makefile.am |    8 -
 .../tests/functional/delegate/Makefile.am          |   28 -
 .../functional/delegate/delegate_common.kshlib     |   71 +-
 .../zfs-tests/tests/functional/delegate/setup.ksh  |    4 +-
 .../functional/delegate/zfs_allow_001_pos.ksh      |    6 +-
 .../zfs-tests/tests/functional/devices/Makefile.am |   11 -
 .../tests/functional/dos_attributes/Makefile.am    |    8 -
 .../zfs-tests/tests/functional/events/.gitignore   |    1 -
 .../zfs-tests/tests/functional/events/Makefile.am  |   18 -
 .../zfs-tests/tests/functional/events/events.cfg   |    2 -
 .../tests/functional/events/events_002_pos.ksh     |   18 +-
 .../tests/functional/events/events_common.kshlib   |   21 +-
 .../tests/functional/events/zed_fd_spill.ksh       |    9 +-
 .../zfs-tests/tests/functional/exec/Makefile.am    |    9 -
 .../tests/functional/exec/exec_002_neg.ksh         |   20 +-
 .../tests/functional/fallocate/Makefile.am         |    6 -
 .../functional/fallocate/fallocate_punch-hole.ksh  |   35 +-
 .../functional/fallocate/fallocate_zero-range.ksh  |  119 ++
 .../zfs-tests/tests/functional/fallocate/setup.ksh |    5 +-
 .../zfs-tests/tests/functional/fault/Makefile.am   |   20 -
 .../functional/fault/auto_offline_001_pos.ksh      |    9 +-
 .../tests/functional/fault/auto_online_001_pos.ksh |   15 +-
 .../functional/fault/auto_replace_001_pos.ksh      |    4 +-
 .../tests/functional/fault/auto_spare_shared.ksh   |    5 +-
 .../zfs-tests/tests/functional/fault/fault.cfg     |    7 +-
 .../tests/functional/fault/zpool_status_-s.ksh     |   13 +-
 .../tests/functional/features/Makefile.am          |    3 -
 .../functional/features/async_destroy/Makefile.am  |    5 -
 .../functional/features/large_dnode/Makefile.am    |   13 -
 .../features/large_dnode/large_dnode_001_pos.ksh   |    2 +-
 .../features/large_dnode/large_dnode_005_pos.ksh   |    4 +-
 .../features/large_dnode/large_dnode_009_pos.ksh   |    2 +-
 .../zfs-tests/tests/functional/grow/Makefile.am    |    7 -
 .../zfs-tests/tests/functional/history/Makefile.am |   23 -
 .../tests/functional/history/history_001_pos.ksh   |    1 -
 .../tests/functional/history/history_003_pos.ksh   |    9 +-
 .../tests/functional/history/history_004_pos.ksh   |    4 +-
 .../tests/functional/history/history_005_neg.ksh   |    8 +-
 .../tests/functional/history/history_006_neg.ksh   |    6 +-
 .../tests/functional/history/history_007_pos.ksh   |   14 +-
 .../tests/functional/history/history_008_pos.ksh   |    3 +-
 .../tests/functional/history/history_010_pos.ksh   |    6 +-
 .../tests/functional/history/history_common.kshlib |   86 +-
 .../zfs-tests/tests/functional/hkdf/Makefile.am    |   17 -
 .../zfs-tests/tests/functional/hkdf/cleanup.ksh    |   22 -
 .../tests/functional/hkdf/run_hkdf_test.ksh        |   30 -
 .../zfs-tests/tests/functional/hkdf/setup.ksh      |   22 -
 .../tests/functional/inheritance/Makefile.am       |   57 -
 .../tests/functional/inheritance/inherit.kshlib    |   14 +-
 .../functional/inheritance/inherit_001_pos.ksh     |   10 +-
 .../zfs-tests/tests/functional/inuse/Makefile.am   |   14 -
 .../tests/functional/inuse/inuse_001_pos.ksh       |    8 +-
 .../tests/functional/inuse/inuse_003_pos.ksh       |   24 +-
 .../tests/functional/inuse/inuse_004_pos.ksh       |   18 +-
 .../tests/functional/inuse/inuse_006_pos.ksh       |    2 +-
 .../tests/functional/inuse/inuse_007_pos.ksh       |    2 +-
 .../zfs-tests/tests/functional/io/Makefile.am      |   13 -
 .../zfs-tests/tests/functional/io/io_uring.ksh     |    2 +-
 .../tests/zfs-tests/tests/functional/io/libaio.ksh |    2 +
 .../tests/zfs-tests/tests/functional/io/mmap.ksh   |    2 +-
 .../zfs-tests/tests/functional/io/posixaio.ksh     |    2 +
 .../tests/zfs-tests/tests/functional/io/psync.ksh  |    2 +
 .../tests/zfs-tests/tests/functional/io/sync.ksh   |    2 +
 .../zfs-tests/tests/functional/l2arc/Makefile.am   |   15 -
 .../tests/functional/l2arc/l2arc_arcstats_pos.ksh  |    2 +
 .../tests/functional/l2arc/l2arc_l2miss_pos.ksh    |    2 +
 .../tests/functional/l2arc/l2arc_mfuonly_pos.ksh   |    2 +
 .../functional/l2arc/persist_l2arc_001_pos.ksh     |    5 +-
 .../functional/l2arc/persist_l2arc_002_pos.ksh     |    5 +-
 .../functional/l2arc/persist_l2arc_003_neg.ksh     |    2 +
 .../functional/l2arc/persist_l2arc_004_pos.ksh     |    5 +-
 .../functional/l2arc/persist_l2arc_005_pos.ksh     |    5 +-
 .../tests/functional/large_files/Makefile.am       |    6 -
 .../tests/functional/largest_pool/Makefile.am      |    6 -
 .../largest_pool/largest_pool_001_pos.ksh          |    5 +-
 .../zfs-tests/tests/functional/libzfs/Makefile.am  |   17 -
 .../zfs-tests/tests/functional/libzfs/many_fds.c   |   54 +-
 .../zfs-tests/tests/functional/limits/Makefile.am  |    9 -
 .../tests/functional/link_count/Makefile.am        |    6 -
 .../tests/functional/log_spacemap/Makefile.am      |    2 -
 .../log_spacemap/log_spacemap_import_logs.ksh      |    7 +-
 .../tests/functional/migration/Makefile.am         |   20 -
 .../tests/functional/migration/cleanup.ksh         |    6 +-
 .../tests/functional/migration/migration.cfg       |    7 +-
 .../tests/functional/migration/migration.kshlib    |   58 +-
 .../functional/migration/migration_001_pos.ksh     |   11 +-
 .../functional/migration/migration_002_pos.ksh     |   19 +-
 .../functional/migration/migration_003_pos.ksh     |   19 +-
 .../functional/migration/migration_004_pos.ksh     |   19 +-
 .../functional/migration/migration_005_pos.ksh     |   27 +-
 .../functional/migration/migration_006_pos.ksh     |   19 +-
 .../functional/migration/migration_007_pos.ksh     |   11 +-
 .../functional/migration/migration_008_pos.ksh     |   19 +-
 .../functional/migration/migration_009_pos.ksh     |   19 +-
 .../functional/migration/migration_010_pos.ksh     |   11 +-
 .../functional/migration/migration_011_pos.ksh     |   19 +-
 .../functional/migration/migration_012_pos.ksh     |   19 +-
 .../zfs-tests/tests/functional/migration/setup.ksh |    3 +-
 .../zfs-tests/tests/functional/mmap/Makefile.am    |   11 -
 .../tests/functional/mmap/mmap_libaio_001_pos.ksh  |    4 +-
 .../tests/functional/mmap/mmap_sync_001_pos.ksh    |   63 +
 .../zfs-tests/tests/functional/mmp/Makefile.am     |   21 -
 .../zfs-tests/tests/functional/mmp/mmp.kshlib      |   56 +-
 .../zfs-tests/tests/functional/mmp/mmp_on_off.ksh  |    6 +-
 .../tests/functional/mmp/mmp_on_thread.ksh         |    4 +-
 .../functional/mmp/mmp_write_distribution.ksh      |   10 +-
 .../zfs-tests/tests/functional/mount/Makefile.am   |    7 -
 .../functional/mount/umount_unlinked_drain.ksh     |    4 +-
*** 1498 LINES SKIPPED ***