From nobody Sun Dec 19 15:40:38 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EA6C71901711; Sun, 19 Dec 2021 15:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JH6PM3Gsbz3JBP; Sun, 19 Dec 2021 15:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5033E24D7D; Sun, 19 Dec 2021 15:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BJFedIb048755; Sun, 19 Dec 2021 15:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJFecCM048750; Sun, 19 Dec 2021 15:40:38 GMT (envelope-from git) Date: Sun, 19 Dec 2021 15:40:38 GMT Message-Id: <202112191540.1BJFecCM048750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 3aa1cabca37d - stable/13 - zfs: merge openzfs/zfs@af88d47f1 (zfs-2.1-release) into stable/13 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3aa1cabca37db4ef3da06e92af17688783ccb00c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639928439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1GjhWXm2Y9QRuz54E0GUgQKQJf0N8AFCe7jtS0+1yIY=; b=BreKHiRfVQYS+IAaazRYO4WNFMxQ2t20e37zLd6adKU2KIShS5kSOnmBaZ3rlDpugD/sp5 BR2PslPq0zDVsr7HlxA6xnpK7kRP0alZ+xUSL2ECkazF9D+9lNgi+438pNfRa8z/uLkEfp 0bX1EgwTZWtSm8ajJzC+zUY9EFdWpNmxtjvm7XKtFkrHBNSyu1NTgWlIgtRmPCHnvoTCyo gS2pi2FYcZ+5vTJ2uGqWgIUc1SaJ8NePZj1ugXDMXkBhrvp9blOZXIWt6NsM0skwQS87fg +oJbwlM+Y2lYBFkTBTrxFbhSpvhmHRs8RI/LIiiRZ9RAGhK4NCEq26jLv0YisA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639928439; a=rsa-sha256; cv=none; b=HrBfZ3ZSJIDpFvPiLH8O9B2PPGXjgu+y4CiQvMq4W/kT9Nv0ay0RJcb+u+UgUWOcwVc1rt X5jZ/h6kn6FIYVnXUqKNoEudIzmV2f4K/LLwRHLmYTHF0XUGbVMM03X/wneOeysWM4FjkT sGmMKRjcekibta45dVripAc0g8MnuVgXTMz4iJCJubp57vmB+1geIfHhcIHVmxGUjB9Adz PUWNiQF+n3BSTQy0+mjrYNygtqYYDtM3pLxBBLVzxR0AmCwB17wn0XuEBo+9WLSLylEdMj WNVrJ0XhFXh7kDyo4BVWHyGH7IWEMEJBKmq0rShqcj3ioxkH40mJAJt0peFVQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=3aa1cabca37db4ef3da06e92af17688783ccb00c commit 3aa1cabca37db4ef3da06e92af17688783ccb00c Merge: 19592949abd2 af88d47f1ee8 Author: Martin Matuska AuthorDate: 2021-12-19 15:21:10 +0000 Commit: Martin Matuska CommitDate: 2021-12-19 15:25:26 +0000 zfs: merge openzfs/zfs@af88d47f1 (zfs-2.1-release) into stable/13 OpenZFS release 2.1.2 Notable upstream pull request merges: #12668 FreeBSD: Catch up with recent VFS changes #12704 Fix some FreeBSD VOPs to synchronize properly with teardown #12717 VOP_RENAME fixes for FreeBSD #12724 Fix lseek(SEEK_DATA/SEEK_HOLE) mmap consistency #12745 Restore dirty dnode detection logic #12770 ZFS send/recv with ashift 9->12 leads to data corruption #12828 FreeBSD: Add vop_standard_writecount_nomsyn #12828 FreeBSD: Catch up with more VFS changes Obtained from: OpenZFS OpenZFS commit: af88d47f1ee86fae4abcfe0dabca67ea3c94d377 OpenZFS tag: zfs-2.1.2 Relnotes: yes .../openzfs/.github/workflows/checkstyle.yaml | 2 +- .../.github/workflows/zfs-tests-functional.yml | 17 +- .../openzfs/.github/workflows/zfs-tests-sanity.yml | 17 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 4 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/Makefile.am | 7 +- sys/contrib/openzfs/cmd/mount_zfs/mount_zfs.c | 2 +- sys/contrib/openzfs/cmd/vdev_id/vdev_id | 6 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 4 +- .../openzfs/cmd/zed/zed.d/statechange-led.sh | 73 +- sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 4 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 1 + sys/contrib/openzfs/cmd/zpool/Makefile.am | 3 +- sys/contrib/openzfs/cmd/zpool/zpool.d/ses | 8 +- sys/contrib/openzfs/cmd/zpool/zpool_iter.c | 50 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 3 +- sys/contrib/openzfs/cmd/zpool/zpool_util.h | 2 +- .../openzfs/cmd/zpool_influxdb/zpool_influxdb.c | 1 + sys/contrib/openzfs/config/Rules.am | 2 +- .../openzfs/config/always-compiler-options.m4 | 23 + sys/contrib/openzfs/config/always-pyzfs.m4 | 15 + sys/contrib/openzfs/config/ax_python_devel.m4 | 33 +- sys/contrib/openzfs/config/kernel-bio.m4 | 87 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 22 + .../openzfs/config/kernel-config-defined.m4 | 31 - sys/contrib/openzfs/config/kernel-fpu.m4 | 15 + .../config/kernel-pagemap-folio_wait_bit.m4 | 26 + sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 22 + sys/contrib/openzfs/config/kernel.m4 | 2 + sys/contrib/openzfs/config/zfs-build.m4 | 1 + sys/contrib/openzfs/configure.ac | 1 + sys/contrib/openzfs/include/libzutil.h | 10 + .../openzfs/include/os/freebsd/linux/compiler.h | 1 + .../openzfs/include/os/freebsd/spl/sys/vnode.h | 20 + .../include/os/freebsd/zfs/sys/zfs_context_os.h | 4 + .../include/os/freebsd/zfs/sys/zfs_znode_impl.h | 3 +- .../include/os/linux/kernel/linux/blkdev_compat.h | 2 +- .../os/linux/kernel/linux/compiler_compat.h | 8 + .../include/os/linux/kernel/linux/simd_x86.h | 3 + .../include/os/linux/zfs/sys/zfs_context_os.h | 6 + .../include/os/linux/zfs/sys/zfs_znode_impl.h | 1 + sys/contrib/openzfs/include/sys/dnode.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 1 - sys/contrib/openzfs/include/sys/zstd/zstd.h | 2 + sys/contrib/openzfs/lib/libnvpair/libnvpair.abi | 1668 ++--- .../libspl/include/os/freebsd/sys/zfs_context_os.h | 1 + .../libspl/include/os/linux/sys/zfs_context_os.h | 3 + .../openzfs/lib/libspl/include/sys/feature_tests.h | 11 +- sys/contrib/openzfs/lib/libuutil/libuutil.abi | 1485 ++-- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 7313 +++++++++----------- sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 5 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 2 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 3832 +++++----- .../openzfs/lib/libzfsbootenv/libzfsbootenv.abi | 415 +- .../openzfs/lib/libzfsbootenv/lzbe_device.c | 2 +- .../lib/libzutil/os/freebsd/zutil_import_os.c | 5 + .../lib/libzutil/os/linux/zutil_device_path_os.c | 146 +- .../lib/libzutil/os/linux/zutil_import_os.c | 67 +- sys/contrib/openzfs/lib/libzutil/zutil_import.c | 70 + sys/contrib/openzfs/lib/libzutil/zutil_nicenum.c | 9 + sys/contrib/openzfs/man/man4/zfs.4 | 2 +- sys/contrib/openzfs/module/Makefile.in | 4 +- .../openzfs/module/icp/core/kcf_prov_tabs.c | 2 +- sys/contrib/openzfs/module/icp/io/aes.c | 2 +- sys/contrib/openzfs/module/lua/lcode.c | 4 + sys/contrib/openzfs/module/lua/lgc.c | 2 +- sys/contrib/openzfs/module/lua/llex.c | 2 +- sys/contrib/openzfs/module/lua/lstrlib.c | 2 +- sys/contrib/openzfs/module/lua/ltable.c | 2 +- sys/contrib/openzfs/module/nvpair/nvpair.c | 6 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 1 - .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 9 + .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 4 + .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 331 +- .../openzfs/module/os/linux/spl/spl-generic.c | 1 + .../openzfs/module/os/linux/zfs/vdev_disk.c | 39 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 4 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 4 + .../openzfs/module/os/linux/zfs/zfs_znode.c | 2 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 6 + sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 69 +- sys/contrib/openzfs/module/unicode/u8_textprep.c | 4 + sys/contrib/openzfs/module/zfs/abd.c | 8 +- sys/contrib/openzfs/module/zfs/arc.c | 1 - sys/contrib/openzfs/module/zfs/dmu.c | 53 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 23 +- sys/contrib/openzfs/module/zfs/dnode.c | 20 + sys/contrib/openzfs/module/zfs/dsl_prop.c | 2 +- sys/contrib/openzfs/module/zfs/spa.c | 2 +- sys/contrib/openzfs/module/zfs/vdev.c | 24 + sys/contrib/openzfs/module/zfs/vdev_label.c | 2 +- .../openzfs/module/zfs/vdev_raidz_math_scalar.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_replay.c | 10 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 9 +- sys/contrib/openzfs/module/zfs/zio_compress.c | 2 +- sys/contrib/openzfs/module/zfs/zvol.c | 102 +- .../module/zstd/include/zstd_compat_wrapper.h | 1 + sys/contrib/openzfs/module/zstd/lib/zstd.c | 2 - sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 4 + sys/contrib/openzfs/rpm/generic/zfs.spec.in | 5 + sys/contrib/openzfs/scripts/mancheck.sh | 20 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 38 +- sys/contrib/openzfs/tests/runfiles/common.run | 2 +- sys/contrib/openzfs/tests/runfiles/sanity.run | 15 +- .../tests/test-runner/bin/test-runner.py.in | 85 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 50 +- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 1 + .../tests/zfs-tests/cmd/file_check/file_check.c | 3 - .../tests/zfs-tests/cmd/mmap_seek/.gitignore | 1 + .../tests/zfs-tests/cmd/mmap_seek/Makefile.am | 6 + .../tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 147 + .../openzfs/tests/zfs-tests/include/commands.cfg | 1 + .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + .../tests/functional/bootfs/bootfs_002_neg.ksh | 11 +- .../tests/functional/casenorm/casenorm.kshlib | 2 +- .../channel_program/lua_core/tst.exists.ksh | 2 +- .../channel_program/lua_core/tst.return_large.ksh | 2 +- .../synctask_core/tst.get_string_props.ksh | 4 +- .../synctask_core/tst.terminate_by_signal.ksh | 2 +- .../tests/functional/cli_root/zfs/zfs_002_pos.ksh | 4 +- .../cli_root/zfs_bookmark/zfs_bookmark_cliargs.ksh | 17 +- .../cli_root/zfs_change-key/zfs_change-key.ksh | 2 +- .../zfs_change-key/zfs_change-key_child.ksh | 2 +- .../zfs_change-key/zfs_change-key_clones.ksh | 2 +- .../zfs_change-key/zfs_change-key_format.ksh | 2 +- .../zfs_change-key/zfs_change-key_inherit.ksh | 2 +- .../zfs_change-key/zfs_change-key_load.ksh | 2 +- .../zfs_change-key/zfs_change-key_location.ksh | 2 +- .../zfs_change-key/zfs_change-key_pbkdf2iters.ksh | 2 +- .../cli_root/zfs_clone/zfs_clone_001_neg.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_002_pos.ksh | 8 +- .../cli_root/zfs_clone/zfs_clone_003_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_004_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_005_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_006_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_007_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_008_neg.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_009_neg.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_010_pos.ksh | 4 +- .../cli_root/zfs_clone/zfs_clone_encrypted.ksh | 4 +- .../cli_root/zfs_copies/zfs_copies_001_pos.ksh | 8 +- .../cli_root/zfs_copies/zfs_copies_002_pos.ksh | 5 +- .../cli_root/zfs_copies/zfs_copies_003_pos.ksh | 4 +- .../cli_root/zfs_copies/zfs_copies_006_pos.ksh | 4 +- .../cli_root/zfs_create/zfs_create_001_pos.ksh | 2 +- .../cli_root/zfs_create/zfs_create_003_pos.ksh | 3 +- .../cli_root/zfs_create/zfs_create_004_pos.ksh | 5 +- .../cli_root/zfs_create/zfs_create_005_pos.ksh | 2 +- .../cli_root/zfs_create/zfs_create_006_pos.ksh | 2 +- .../cli_root/zfs_create/zfs_create_008_neg.ksh | 5 +- .../cli_root/zfs_create/zfs_create_011_pos.ksh | 5 +- .../cli_root/zfs_create/zfs_create_012_pos.ksh | 5 +- .../cli_root/zfs_create/zfs_create_014_pos.ksh | 3 +- .../zfs_create/zfs_create_crypt_combos.ksh | 4 +- .../cli_root/zfs_create/zfs_create_dryrun.ksh | 5 +- .../cli_root/zfs_create/zfs_create_encrypted.ksh | 4 +- .../cli_root/zfs_create/zfs_create_verbose.ksh | 5 +- .../cli_root/zfs_destroy/zfs_destroy_001_pos.ksh | 4 +- .../cli_root/zfs_destroy/zfs_destroy_003_pos.ksh | 7 +- .../cli_root/zfs_destroy/zfs_destroy_004_pos.ksh | 10 +- .../cli_root/zfs_destroy/zfs_destroy_007_neg.ksh | 4 +- .../cli_root/zfs_destroy/zfs_destroy_014_pos.ksh | 2 +- .../cli_root/zfs_destroy/zfs_destroy_015_pos.ksh | 4 +- .../cli_root/zfs_destroy/zfs_destroy_016_pos.ksh | 8 +- .../zfs_destroy/zfs_destroy_clone_livelist.ksh | 2 +- .../cli_root/zfs_destroy/zfs_destroy_common.kshlib | 4 +- .../cli_root/zfs_diff/zfs_diff_cliargs.ksh | 4 +- .../cli_root/zfs_diff/zfs_diff_timestamp.ksh | 4 +- .../cli_root/zfs_get/zfs_get_004_pos.ksh | 9 +- .../cli_root/zfs_get/zfs_get_list_d.kshlib | 4 +- .../cli_root/zfs_inherit/zfs_inherit_002_neg.ksh | 5 +- .../cli_root/zfs_inherit/zfs_inherit_003_pos.ksh | 4 +- .../cli_root/zfs_load-key/zfs_load-key.ksh | 2 +- .../cli_root/zfs_load-key/zfs_load-key_all.ksh | 11 +- .../cli_root/zfs_load-key/zfs_load-key_file.ksh | 2 +- .../zfs_load-key/zfs_load-key_location.ksh | 2 +- .../cli_root/zfs_load-key/zfs_load-key_noop.ksh | 2 +- .../zfs_load-key/zfs_load-key_recursive.ksh | 2 +- .../cli_root/zfs_mount/zfs_mount_008_pos.ksh | 4 +- .../cli_root/zfs_mount/zfs_mount_011_neg.ksh | 7 +- .../cli_root/zfs_mount/zfs_mount_encrypted.ksh | 2 +- .../cli_root/zfs_mount/zfs_mount_remount.ksh | 2 +- .../cli_root/zfs_promote/zfs_promote_001_pos.ksh | 3 +- .../cli_root/zfs_promote/zfs_promote_003_pos.ksh | 3 +- .../cli_root/zfs_promote/zfs_promote_004_pos.ksh | 3 +- .../cli_root/zfs_promote/zfs_promote_005_pos.ksh | 4 +- .../cli_root/zfs_promote/zfs_promote_006_neg.ksh | 8 +- .../cli_root/zfs_promote/zfs_promote_007_neg.ksh | 3 +- .../zfs_promote/zfs_promote_encryptionroot.ksh | 6 +- .../zfs_property/zfs_written_property_001_pos.ksh | 2 +- .../cli_root/zfs_receive/zfs_receive_001_pos.ksh | 9 +- .../cli_root/zfs_receive/zfs_receive_002_pos.ksh | 9 +- .../cli_root/zfs_receive/zfs_receive_003_pos.ksh | 2 +- .../cli_root/zfs_receive/zfs_receive_004_neg.ksh | 3 +- .../cli_root/zfs_receive/zfs_receive_005_neg.ksh | 6 +- .../cli_root/zfs_receive/zfs_receive_006_pos.ksh | 6 +- .../cli_root/zfs_receive/zfs_receive_007_neg.ksh | 2 +- .../cli_root/zfs_receive/zfs_receive_008_pos.ksh | 10 +- .../cli_root/zfs_receive/zfs_receive_009_neg.ksh | 9 +- .../cli_root/zfs_receive/zfs_receive_013_pos.ksh | 2 +- .../zfs_receive/zfs_receive_from_encrypted.ksh | 4 +- .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh | 4 +- .../cli_root/zfs_receive/zfs_receive_raw.ksh | 4 +- .../cli_root/zfs_receive/zfs_receive_raw_-d.ksh | 2 +- .../zfs_receive/zfs_receive_raw_incremental.ksh | 4 +- .../zfs_receive/zfs_receive_to_encrypted.ksh | 4 +- .../cli_root/zfs_rename/zfs_rename.kshlib | 10 +- .../cli_root/zfs_rename/zfs_rename_003_pos.ksh | 2 +- .../cli_root/zfs_rename/zfs_rename_007_pos.ksh | 5 +- .../cli_root/zfs_rename/zfs_rename_008_pos.ksh | 11 +- .../cli_root/zfs_rename/zfs_rename_011_pos.ksh | 17 +- .../cli_root/zfs_rename/zfs_rename_013_pos.ksh | 20 +- .../zfs_rename/zfs_rename_encrypted_child.ksh | 4 +- .../zfs_rename/zfs_rename_to_encrypted.ksh | 2 +- .../cli_root/zfs_rollback/zfs_rollback_001_pos.ksh | 4 +- .../cli_root/zfs_rollback/zfs_rollback_003_neg.ksh | 4 +- .../cli_root/zfs_rollback/zfs_rollback_004_neg.ksh | 5 +- .../zfs_rollback/zfs_rollback_common.kshlib | 4 +- .../functional/cli_root/zfs_send/zfs_send-b.ksh | 2 +- .../cli_root/zfs_send/zfs_send_001_pos.ksh | 6 +- .../cli_root/zfs_send/zfs_send_002_pos.ksh | 7 +- .../cli_root/zfs_send/zfs_send_003_pos.ksh | 4 +- .../cli_root/zfs_send/zfs_send_004_neg.ksh | 3 +- .../cli_root/zfs_send/zfs_send_005_pos.ksh | 2 +- .../cli_root/zfs_send/zfs_send_encrypted.ksh | 2 +- .../zfs_send/zfs_send_encrypted_unloaded.ksh | 2 +- .../functional/cli_root/zfs_send/zfs_send_raw.ksh | 6 +- .../cli_root/zfs_send/zfs_send_skip_missing.ksh | 4 +- .../cli_root/zfs_send/zfs_send_sparse.ksh | 8 +- .../cli_root/zfs_set/canmount_001_pos.ksh | 11 +- .../cli_root/zfs_set/canmount_002_pos.ksh | 13 +- .../cli_root/zfs_set/canmount_003_pos.ksh | 7 +- .../cli_root/zfs_set/readonly_001_pos.ksh | 2 +- .../cli_root/zfs_set/snapdir_001_pos.ksh | 3 +- .../cli_root/zfs_set/user_property_004_pos.ksh | 4 +- .../cli_root/zfs_set/zfs_set_003_neg.ksh | 5 +- .../cli_root/zfs_set/zfs_set_keylocation.ksh | 3 +- .../cli_root/zfs_share/zfs_share_001_pos.ksh | 7 +- .../cli_root/zfs_share/zfs_share_004_pos.ksh | 5 +- .../cli_root/zfs_share/zfs_share_006_pos.ksh | 2 +- .../cli_root/zfs_share/zfs_share_011_pos.ksh | 10 +- .../zfs_share/zfs_share_concurrent_shares.ksh | 6 +- .../cli_root/zfs_snapshot/zfs_snapshot_001_neg.ksh | 2 +- .../cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh | 5 +- .../cli_root/zfs_snapshot/zfs_snapshot_004_neg.ksh | 8 +- .../cli_root/zfs_snapshot/zfs_snapshot_005_neg.ksh | 8 +- .../cli_root/zfs_snapshot/zfs_snapshot_006_pos.ksh | 4 +- .../cli_root/zfs_snapshot/zfs_snapshot_007_neg.ksh | 4 +- .../cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh | 9 +- .../cli_root/zfs_unload-key/zfs_unload-key.ksh | 2 +- .../cli_root/zfs_unload-key/zfs_unload-key_all.ksh | 7 +- .../zfs_unload-key/zfs_unload-key_recursive.ksh | 2 +- .../cli_root/zfs_unmount/zfs_unmount_001_pos.ksh | 2 +- .../cli_root/zfs_unmount/zfs_unmount_008_neg.ksh | 8 +- .../cli_root/zfs_unmount/zfs_unmount_009_pos.ksh | 4 +- .../zfs_unmount/zfs_unmount_unload_keys.ksh | 6 +- .../cli_root/zfs_unshare/zfs_unshare_001_pos.ksh | 15 +- .../cli_root/zfs_unshare/zfs_unshare_002_pos.ksh | 15 +- .../cli_root/zfs_unshare/zfs_unshare_003_pos.ksh | 5 +- .../cli_root/zfs_unshare/zfs_unshare_007_pos.ksh | 5 +- .../cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh | 8 +- .../cli_root/zfs_upgrade/zfs_upgrade_003_pos.ksh | 4 +- .../cli_root/zfs_upgrade/zfs_upgrade_004_pos.ksh | 4 +- .../cli_root/zfs_upgrade/zfs_upgrade_005_pos.ksh | 4 +- .../zpool_destroy/zpool_destroy_001_pos.ksh | 3 +- .../zpool_destroy/zpool_destroy_002_pos.ksh | 2 +- .../zpool_history/zpool_history_001_neg.ksh | 4 +- .../functional/cli_root/zpool_import/cleanup.ksh | 3 +- .../cli_root/zpool_import/zpool_import_012_pos.ksh | 6 +- .../zpool_scrub/zpool_scrub_encrypted_unloaded.ksh | 2 +- .../async_destroy/async_destroy_001_pos.ksh | 2 +- .../features/large_dnode/large_dnode_001_pos.ksh | 2 +- .../features/large_dnode/large_dnode_002_pos.ksh | 2 +- .../features/large_dnode/large_dnode_004_neg.ksh | 4 +- .../features/large_dnode/large_dnode_005_pos.ksh | 9 +- .../features/large_dnode/large_dnode_006_pos.ksh | 2 +- .../features/large_dnode/large_dnode_009_pos.ksh | 4 +- .../tests/functional/history/history_002_pos.ksh | 2 +- .../tests/functional/history/history_006_neg.ksh | 4 +- .../tests/functional/history/history_007_pos.ksh | 2 +- .../tests/functional/history/history_008_pos.ksh | 4 +- .../tests/functional/history/history_010_pos.ksh | 2 +- .../tests/functional/history/history_common.kshlib | 4 +- .../largest_pool/largest_pool_001_pos.ksh | 6 +- .../zfs-tests/tests/functional/mmap/Makefile.am | 3 +- .../tests/functional/mmap/mmap_seek_001_pos.ksh | 67 + .../tests/functional/nopwrite/nopwrite_copies.ksh | 2 +- .../tests/functional/nopwrite/nopwrite_mtime.ksh | 2 +- .../functional/nopwrite/nopwrite_negative.ksh | 2 +- .../nopwrite/nopwrite_promoted_clone.ksh | 2 +- .../tests/functional/nopwrite/nopwrite_recsize.ksh | 2 +- .../tests/functional/nopwrite/nopwrite_sync.ksh | 2 +- .../nopwrite/nopwrite_varying_compression.ksh | 2 +- .../tests/functional/nopwrite/nopwrite_volume.ksh | 2 +- .../tests/functional/procfs/procfs_list_basic.ksh | 2 +- .../procfs/procfs_list_concurrent_readers.ksh | 2 +- .../projectquota/projectquota_004_neg.ksh | 4 +- .../projectquota/projectquota_005_pos.ksh | 4 +- .../projectquota/projectquota_008_pos.ksh | 4 +- .../projectquota/projectquota_009_pos.ksh | 4 +- .../projectquota/projectspace_001_pos.ksh | 4 +- .../projectquota/projectspace_002_pos.ksh | 4 +- .../projectquota/projectspace_003_pos.ksh | 4 +- .../projectquota/projectspace_004_pos.ksh | 4 +- .../tests/functional/quota/quota_005_pos.ksh | 3 +- .../functional/refreserv/refreserv_002_pos.ksh | 6 +- .../functional/reservation/reservation_002_pos.ksh | 2 +- .../functional/reservation/reservation_003_pos.ksh | 2 +- .../functional/reservation/reservation_004_pos.ksh | 2 +- .../functional/reservation/reservation_005_pos.ksh | 2 +- .../functional/reservation/reservation_007_pos.ksh | 8 +- .../functional/reservation/reservation_008_pos.ksh | 2 +- .../functional/reservation/reservation_009_pos.ksh | 4 +- .../functional/reservation/reservation_010_pos.ksh | 2 +- .../functional/reservation/reservation_013_pos.ksh | 4 +- .../functional/reservation/reservation_014_pos.ksh | 2 +- .../functional/reservation/reservation_015_pos.ksh | 3 +- .../functional/reservation/reservation_016_pos.ksh | 3 +- .../functional/reservation/reservation_018_pos.ksh | 2 +- .../tests/functional/rsend/send-c_lz4_disabled.ksh | 4 +- .../functional/rsend/send-c_recv_lz4_disabled.ksh | 4 +- .../rsend/send-c_stream_size_estimate.ksh | 4 +- .../functional/rsend/send-cpL_varied_recsize.ksh | 4 +- .../functional/rsend/send_encrypted_files.ksh | 4 +- .../rsend/send_encrypted_truncated_files.ksh | 4 +- .../tests/functional/rsend/send_mixed_raw.ksh | 6 +- .../functional/rsend/send_realloc_dnode_size.ksh | 9 +- .../tests/functional/snapshot/clone_001_pos.ksh | 4 +- .../tests/functional/snapshot/snapshot_011_pos.ksh | 3 +- .../tests/functional/snapshot/snapshot_012_pos.ksh | 7 +- .../tests/functional/snapshot/snapshot_013_pos.ksh | 7 +- .../tests/functional/snapshot/snapshot_014_pos.ksh | 3 +- .../tests/functional/snapshot/snapshot_015_pos.ksh | 2 +- .../tests/functional/snapshot/snapshot_016_pos.ksh | 19 +- .../tests/functional/snapshot/snapshot_017_pos.ksh | 5 +- .../tests/functional/snapused/snapused_001_pos.ksh | 2 +- .../tests/functional/snapused/snapused_002_pos.ksh | 2 +- .../tests/functional/snapused/snapused_003_pos.ksh | 2 +- .../tests/functional/snapused/snapused_004_pos.ksh | 2 +- .../tests/functional/snapused/snapused_005_pos.ksh | 2 +- .../functional/userquota/groupspace_001_pos.ksh | 4 +- .../functional/userquota/groupspace_002_pos.ksh | 4 +- .../functional/userquota/groupspace_003_pos.ksh | 4 +- .../functional/userquota/userquota_005_neg.ksh | 4 +- .../functional/userquota/userquota_006_pos.ksh | 4 +- .../functional/userquota/userquota_009_pos.ksh | 4 +- .../functional/userquota/userquota_011_pos.ksh | 4 +- .../functional/userquota/userquota_012_neg.ksh | 4 +- .../functional/userquota/userspace_001_pos.ksh | 4 +- .../functional/userquota/userspace_002_pos.ksh | 4 +- .../functional/userquota/userspace_003_pos.ksh | 4 +- .../functional/zvol/zvol_cli/zvol_cli_002_pos.ksh | 2 +- .../tests/functional/zvol/zvol_common.shlib | 5 +- .../zvol/zvol_misc/zvol_misc_002_pos.ksh | 2 +- .../zvol/zvol_misc/zvol_misc_004_pos.ksh | 5 +- .../zvol/zvol_misc/zvol_misc_snapdev.ksh | 4 +- .../zvol/zvol_swap/zvol_swap_004_pos.ksh | 2 +- sys/modules/zfs/zfs_config.h | 32 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 362 files changed, 8615 insertions(+), 9303 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-pagemap-folio_wait_bit.m4 index 000000000000,e0aaa4a57411..e0aaa4a57411 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-pagemap-folio_wait_bit.m4 +++ b/sys/contrib/openzfs/config/kernel-pagemap-folio_wait_bit.m4 diff --cc sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h index 3670712a0456,000000000000..1ac595aa15dd mode 100644,000000..100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/vnode.h @@@ -1,208 -1,0 +1,228 @@@ +/* + * Copyright (c) 2007 Pawel Jakub Dawidek + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _OPENSOLARIS_SYS_VNODE_H_ +#define _OPENSOLARIS_SYS_VNODE_H_ + +struct vnode; +struct vattr; +struct xucred; + +typedef struct flock flock64_t; +typedef struct vnode vnode_t; +typedef struct vattr vattr_t; +typedef enum vtype vtype_t; + +#include +#include +#include_next +#include +enum symfollow { NO_FOLLOW = NOFOLLOW }; + +#define NOCRED ((struct ucred *)0) /* no credential available */ +#define F_FREESP 11 /* Free file space */ + +#include +#include +#ifndef IN_BASE +#include_next +#endif +#include +#include +#include +#include +#include +#include +#include ++#include ++#include + +typedef struct vop_vector vnodeops_t; +#define VOP_FID VOP_VPTOFH +#define vop_fid vop_vptofh +#define vop_fid_args vop_vptofh_args +#define a_fid a_fhp + +#define rootvfs (rootvnode == NULL ? NULL : rootvnode->v_mount) + +#ifndef IN_BASE +static __inline int +vn_is_readonly(vnode_t *vp) +{ + return (vp->v_mount->mnt_flag & MNT_RDONLY); +} +#endif +#define vn_vfswlock(vp) (0) +#define vn_vfsunlock(vp) do { } while (0) +#define vn_ismntpt(vp) \ + ((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL) +#define vn_mountedvfs(vp) ((vp)->v_mountedhere) +#define vn_has_cached_data(vp) \ + ((vp)->v_object != NULL && \ + (vp)->v_object->resident_page_count > 0) ++ ++#ifndef IN_BASE ++static __inline void ++vn_flush_cached_data(vnode_t *vp, boolean_t sync) ++{ ++#if __FreeBSD_version > 1300054 ++ if (vm_object_mightbedirty(vp->v_object)) { ++#else ++ if (vp->v_object->flags & OBJ_MIGHTBEDIRTY) { ++#endif ++ int flags = sync ? OBJPC_SYNC : 0; ++ zfs_vmobject_wlock(vp->v_object); ++ vm_object_page_clean(vp->v_object, 0, 0, flags); ++ zfs_vmobject_wunlock(vp->v_object); ++ } ++} ++#endif ++ +#define vn_exists(vp) do { } while (0) +#define vn_invalid(vp) do { } while (0) +#define vn_renamepath(tdvp, svp, tnm, lentnm) do { } while (0) +#define vn_free(vp) do { } while (0) +#define vn_matchops(vp, vops) ((vp)->v_op == &(vops)) + +#define VN_HOLD(v) vref(v) +#define VN_RELE(v) vrele(v) +#define VN_URELE(v) vput(v) + +#define vnevent_create(vp, ct) do { } while (0) +#define vnevent_link(vp, ct) do { } while (0) +#define vnevent_remove(vp, dvp, name, ct) do { } while (0) +#define vnevent_rmdir(vp, dvp, name, ct) do { } while (0) +#define vnevent_rename_src(vp, dvp, name, ct) do { } while (0) +#define vnevent_rename_dest(vp, dvp, name, ct) do { } while (0) +#define vnevent_rename_dest_dir(vp, ct) do { } while (0) + +#define specvp(vp, rdev, type, cr) (VN_HOLD(vp), (vp)) +#define MANDLOCK(vp, mode) (0) + +/* + * We will use va_spare is place of Solaris' va_mask. + * This field is initialized in zfs_setattr(). + */ +#define va_mask va_spare +/* TODO: va_fileid is shorter than va_nodeid !!! */ +#define va_nodeid va_fileid +/* TODO: This field needs conversion! */ +#define va_nblocks va_bytes +#define va_blksize va_blocksize +#define va_seq va_gen + +#define MAXOFFSET_T OFF_MAX +#define EXCL 0 + +#define FCREAT O_CREAT +#define FTRUNC O_TRUNC +#define FEXCL O_EXCL +#ifndef FDSYNC +#define FDSYNC FFSYNC +#endif +#define FRSYNC FFSYNC +#define FSYNC FFSYNC +#define FOFFMAX 0x00 +#define FIGNORECASE 0x00 + +/* + * Attributes of interest to the caller of setattr or getattr. + */ +#define AT_MODE 0x00002 +#define AT_UID 0x00004 +#define AT_GID 0x00008 +#define AT_FSID 0x00010 +#define AT_NODEID 0x00020 +#define AT_NLINK 0x00040 +#define AT_SIZE 0x00080 +#define AT_ATIME 0x00100 +#define AT_MTIME 0x00200 +#define AT_CTIME 0x00400 +#define AT_RDEV 0x00800 +#define AT_BLKSIZE 0x01000 +#define AT_NBLOCKS 0x02000 +/* 0x04000 */ /* unused */ +#define AT_SEQ 0x08000 +/* + * If AT_XVATTR is set then there are additional bits to process in + * the xvattr_t's attribute bitmap. If this is not set then the bitmap + * MUST be ignored. Note that this bit must be set/cleared explicitly. + * That is, setting AT_ALL will NOT set AT_XVATTR. + */ +#define AT_XVATTR 0x10000 + +#define AT_ALL (AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\ + AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|\ + AT_RDEV|AT_BLKSIZE|AT_NBLOCKS|AT_SEQ) + +#define AT_STAT (AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\ + AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV) + +#define AT_TIMES (AT_ATIME|AT_MTIME|AT_CTIME) + +#define AT_NOSET (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|\ + AT_BLKSIZE|AT_NBLOCKS|AT_SEQ) + +#ifndef IN_BASE +static __inline void +vattr_init_mask(vattr_t *vap) +{ + + vap->va_mask = 0; + + if (vap->va_uid != (uid_t)VNOVAL) + vap->va_mask |= AT_UID; + if (vap->va_gid != (gid_t)VNOVAL) + vap->va_mask |= AT_GID; + if (vap->va_size != (u_quad_t)VNOVAL) + vap->va_mask |= AT_SIZE; + if (vap->va_atime.tv_sec != VNOVAL) + vap->va_mask |= AT_ATIME; + if (vap->va_mtime.tv_sec != VNOVAL) + vap->va_mask |= AT_MTIME; + if (vap->va_mode != (uint16_t)VNOVAL) + vap->va_mask |= AT_MODE; + if (vap->va_flags != VNOVAL) + vap->va_mask |= AT_XVATTR; +} +#endif + +#define RLIM64_INFINITY 0 + +static __inline int +vn_rename(char *from, char *to, enum uio_seg seg) +{ + + ASSERT(seg == UIO_SYSSPACE); + + return (kern_renameat(curthread, AT_FDCWD, from, AT_FDCWD, to, seg)); +} + +#include + +#endif /* _OPENSOLARIS_SYS_VNODE_H_ */ diff --cc sys/contrib/openzfs/lib/libspl/include/sys/feature_tests.h index 1a68b75f0cdc,000000000000..c9564b2c3269 mode 100644,000000..100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/feature_tests.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/feature_tests.h @@@ -1,32 -1,0 +1,41 @@@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#ifndef _SYS_FEATURE_TESTS_H +#define _SYS_FEATURE_TESTS_H + - #define __NORETURN __attribute__((__noreturn__)) ++#define ____cacheline_aligned ++#define __NORETURN __attribute__((__noreturn__)) ++ ++#if !defined(fallthrough) && !defined(_LIBCPP_VERSION) ++#if defined(HAVE_IMPLICIT_FALLTHROUGH) ++#define fallthrough __attribute__((__fallthrough__)) ++#else ++#define fallthrough ((void)0) ++#endif ++#endif + +#endif diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore index 000000000000,6b05a7917500..6b05a7917500 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/.gitignore diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am index 000000000000,b938931125f5..b938931125f5 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/Makefile.am diff --cc sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c index 000000000000,f476e1dba9a4..f476e1dba9a4 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c +++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh index 000000000000,6188549ad8d2..6188549ad8d2 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/mmap/mmap_seek_001_pos.ksh diff --cc sys/modules/zfs/zfs_config.h index fa3d4feec5de,000000000000..2e5f26c8ce45 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,852 -1,0 +1,870 @@@ +/* + * $FreeBSD$ + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + ++/* block_device_operations->submit_bio() returns void */ ++/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ ++ +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + ++/* bio_set_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() handles ERESTARTSYS */ ++/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ ++ +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + *** 609 LINES SKIPPED ***