From nobody Fri May 30 09:34:18 2025 X-Original-To: dev-commits-src-main@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 4b7yk32WH8z5xLG5; Fri, 30 May 2025 09:34:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7yk32DS5z3cDJ; Fri, 30 May 2025 09:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748597659; 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=cnBT/MwH88kjDsNgYOeUgGrYMNSYc5BbIqDbEcNJuIc=; b=uGG0dLLgjh8mMK+qEud29Es+eG9X21xZzHUNnaxrQ1I6Lszi8Be6Zv3rbMM9kvH/sDRoF0 Fs5yfOOrR+tMZ5OqqktFyinWsO0SgUZIK0YUTusD7hpiHd11J7vdLmpzg258hWlaFA9oru SH+Mz+qVs2YX9GLkw9prGbBliHRxARVJMGINfDuK8iV1htMbYwIvIK9RdxVMryXo2PTiyC hXnL3pSHAjbKW2fIy3wjf4bP8Wwhfqntobuww8++cLylNDFMW5ipKkzixL/+Q17Kqu0OTm Ajx9BuX5eeluku0zbS1hDgix/y+IHPpW+0ytr1FhJ8z4L4XLx8Mndd2gg3wGbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748597659; a=rsa-sha256; cv=none; b=g6obFb+jJw8m1ym1pCMZgtmCnJMYn8XknOHosRYXVud0i1RFQZwsO69Z8W7ut8ACEcphpB fMamsQqTdy9qYUONExaD6JIW9QLzvENvI0kF9HhOYBLSdK5YJQseTwOzz8duszG1goiB+l od2A4YRT6gBtik1eAFG9IAcBgxfql9P0MdkowoHyY7qFXKOudk13p5QmrFMPu5mw/F201Z YnDRmq4QlGZbLOvK57+6QXdJzy+pIvYsY8lI1Ks8P8lCZiCTrpO0Rdg/dznZWcBAmmtgta 6rJRw0CMItpMEVPQmshLs2Y4UuSdEA/N9QgXedExHwc92JTNCBS/Gtxdp8cDnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748597659; 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=cnBT/MwH88kjDsNgYOeUgGrYMNSYc5BbIqDbEcNJuIc=; b=QLLDzPt8q77jgfXL9I7t2pW1S7gs4uPr+U0C3uR73/jYP/XTVicauRxOyPRICDujk2CFG4 om1vvxPy8VHoGn3QnUf4+x5vgz5gl01XgS2UL8dBZLO9jAAV12BloVbQWK0Yr00teKdRel cJ1/LG/JCJ6Y5m6A+0SIp9ptwoyW+/Ea4hyG3ZsBCArEWj06TuFkS7CRNF8hZef1ODKMJL sMwNcTIOReoLQfEnpk4TgKg1J6q/HYERWCUvTbeaAmngNL/+ABqQJDOd+padmx4tVYWeOZ 0oJc33bd8/oKob+gKkGAAjN43ujQ9cJfC+ayoUeVL7Fn9TZEIqpfcryMc0jHDg== 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 4b7yk31f9XznDc; Fri, 30 May 2025 09:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54U9YJSB066717; Fri, 30 May 2025 09:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54U9YIht066712; Fri, 30 May 2025 09:34:18 GMT (envelope-from git) Date: Fri, 30 May 2025 09:34:18 GMT Message-Id: <202505300934.54U9YIht066712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: b1c1ee4429fc - main - zfs: merge openzfs/zfs@3084336ae List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b1c1ee4429fcca8f69873a8be66184e68e1b19d7 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b1c1ee4429fcca8f69873a8be66184e68e1b19d7 commit b1c1ee4429fcca8f69873a8be66184e68e1b19d7 Merge: 955ab1a8f21e 3084336ae4a4 Author: Martin Matuska AuthorDate: 2025-05-30 07:59:22 +0000 Commit: Martin Matuska CommitDate: 2025-05-30 09:17:41 +0000 zfs: merge openzfs/zfs@3084336ae Notable upstream pull request merges: #14876 b048bfa9c Allow opt-in of zvol blocks in special class #16486 b6916f995 ARC: parallel eviction #17169 1a8f5ad3b zvol: Enable zvol threading functionality on FreeBSD #17209 c17bdc491 More aggressively assert that db_mtx protects db.db_data #17218 734eba251 Wire O_DIRECT also to Uncached I/O #17246 49fbdd453 Introduce zfs rewrite subcommand #17255 b1ccab172 ARC: Avoid overflows in arc_evict_adj() #17280 848794503 zcp: get_prop: fix encryptionroot and encryption #17301 086105f4c Cause zpool scan resume commands to get logged in history #17306 246e5883b zfs_valstr: update zio_flag strings for ZIO_FLAG_PREALLOCATED #17309 78628a5c1 FreeBSD: Use new SYSCTL_SIZEOF() #17314 89a8a9158 ARC: Notify dbuf cache about target size reduction #17319 8b9c4e643 spa: clear checkpoint information during retry #17339 d5616ad34 Increase meta-dnode redundancy in "some" mode #17340 ea74cdedd Fix 2 bugs in non-raw send with encryption #17342 e55225be3 Add explicit DMU_DIRECTIO checks #17343 d8a33bc0a icp: Use explicit_memset() exclusively in gcm_clear_ctx() #17344 -multiple libzfs_core: add ZFS_IOC_TRACE envvar to enable ioctl tracing #17348 f0baaa329 arcstat: prevent ZeroDivisionError when L2ARC becomes empty #17353 83fa80a55 dmu_objset_hold_flags() should call dsl_dataset_rele_flags() on error #17355 -multiple Allow txg_wait_synced_flags() and dmu_tx_assign() to return when the pool suspends #17361 5c30b2438 Fix null dereference in spa_vdev_remove_cancel_sync() #17363 ddf28f27c Fix off-by-one bug in range tree code #17367 06fa8f3f6 zfs_cmd: reorganise zfs_cmd_t to match original size #17368 2a91d577b Expose dataset encryption status via fast stat path #17372 c464f1d01 Only interrupt active disk I/Os in failmode=continue #17373 9d76950d6 ZIL: Improve write log size accounting #17377 -multiple tunables: general code cleanup #17379 fa697b94e FreeBSD: Add posix_fadvise(POSIX_FADV_WILLNEED) support #17384 3dfa98d01 ZVOL: Make zvol_inhibit_dev module parameter platform-independent Obtained from: OpenZFS OpenZFS commit: 3084336ae4a4e114e41be3177a3f5c779d66e93c cddl/lib/libzfs_core/Makefile | 1 + cddl/sbin/zfs/Makefile | 1 + .../openzfs/.github/PULL_REQUEST_TEMPLATE.md | 1 + .../.github/workflows/scripts/qemu-3-deps-vm.sh | 26 +++ .../.github/workflows/scripts/qemu-3-deps.sh | 15 +- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 17 +- sys/contrib/openzfs/.mailmap | 8 +- sys/contrib/openzfs/AUTHORS | 10 +- sys/contrib/openzfs/META | 2 +- sys/contrib/openzfs/cmd/arcstat.in | 13 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 204 ++++++++++++++++- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 32 +-- sys/contrib/openzfs/cmd/ztest.c | 24 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 57 +++-- sys/contrib/openzfs/config/kernel-timer.m4 | 32 +++ sys/contrib/openzfs/config/kernel.m4 | 2 + .../contrib/debian/openzfs-zfsutils.install | 1 + sys/contrib/openzfs/include/libzfs.h | 1 + .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 5 +- .../include/os/linux/kernel/linux/mod_compat.h | 65 ++---- .../include/os/linux/kernel/linux/page_compat.h | 4 +- sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 4 +- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 35 --- sys/contrib/openzfs/include/sys/dbuf.h | 27 +-- sys/contrib/openzfs/include/sys/dmu.h | 106 ++++++--- sys/contrib/openzfs/include/sys/dmu_impl.h | 10 +- sys/contrib/openzfs/include/sys/dmu_tx.h | 6 +- sys/contrib/openzfs/include/sys/dmu_zfetch.h | 5 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 9 + sys/contrib/openzfs/include/sys/metaslab.h | 6 +- sys/contrib/openzfs/include/sys/spa.h | 4 +- sys/contrib/openzfs/include/sys/txg.h | 9 + sys/contrib/openzfs/include/sys/zfs_ioctl.h | 34 ++- sys/contrib/openzfs/include/sys/zfs_racct.h | 6 +- sys/contrib/openzfs/include/sys/zfs_vnops.h | 1 + sys/contrib/openzfs/include/sys/zvol_impl.h | 32 +++ sys/contrib/openzfs/lib/libzfs/libzfs.abi | 134 ++++++----- sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 11 + sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 5 + sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 6 + .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 6 - .../openzfs/lib/libzfs/os/linux/libzfs_util_os.c | 6 - sys/contrib/openzfs/lib/libzfs_core/Makefile.am | 7 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 94 +++++--- sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c | 44 ++++ .../openzfs/lib/libzfs_core/libzfs_core_impl.h | 36 +++ .../lib/libzfs_core/os/freebsd/libzfs_core_ioctl.c | 3 +- .../lib/libzfs_core/os/linux/libzfs_core_ioctl.c | 3 +- sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 4 +- sys/contrib/openzfs/man/Makefile.am | 1 + sys/contrib/openzfs/man/man4/zfs.4 | 59 +++-- sys/contrib/openzfs/man/man7/zfsprops.7 | 7 +- sys/contrib/openzfs/man/man7/zpoolconcepts.7 | 5 +- sys/contrib/openzfs/man/man8/zfs-rewrite.8 | 76 +++++++ sys/contrib/openzfs/man/man8/zfs.8 | 8 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 80 +++---- sys/contrib/openzfs/module/Kbuild.in | 13 -- sys/contrib/openzfs/module/icp/algs/aes/aes_impl.c | 2 - sys/contrib/openzfs/module/icp/algs/modes/gcm.c | 2 - sys/contrib/openzfs/module/icp/algs/modes/modes.c | 4 +- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 15 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 11 +- .../openzfs/module/os/freebsd/zfs/zfs_racct.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 87 +++++++- .../openzfs/module/os/freebsd/zfs/zio_crypt.c | 6 - .../openzfs/module/os/freebsd/zfs/zvol_os.c | 193 ++++++++-------- .../openzfs/module/os/linux/spl/spl-generic.c | 23 -- .../openzfs/module/os/linux/spl/spl-taskq.c | 28 +-- .../openzfs/module/os/linux/zfs/vdev_disk.c | 25 +-- .../openzfs/module/os/linux/zfs/zfs_racct.c | 8 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 11 +- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 2 +- .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 34 ++- .../openzfs/module/os/linux/zfs/zpl_file_range.c | 82 ------- .../openzfs/module/os/linux/zfs/zpl_inode.c | 21 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 152 +------------ sys/contrib/openzfs/module/zcommon/zfs_prop.c | 3 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 1 + sys/contrib/openzfs/module/zfs/arc.c | 245 +++++++++++++++++++-- sys/contrib/openzfs/module/zfs/dbuf.c | 169 +++++++------- sys/contrib/openzfs/module/zfs/ddt.c | 2 +- sys/contrib/openzfs/module/zfs/dmu.c | 212 +++++++++--------- sys/contrib/openzfs/module/zfs/dmu_direct.c | 14 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 11 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 21 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 6 +- sys/contrib/openzfs/module/zfs/dmu_traverse.c | 16 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 111 ++++++++-- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 9 +- sys/contrib/openzfs/module/zfs/dnode.c | 4 +- sys/contrib/openzfs/module/zfs/dnode_sync.c | 1 + sys/contrib/openzfs/module/zfs/dsl_dataset.c | 3 + sys/contrib/openzfs/module/zfs/dsl_scan.c | 6 +- sys/contrib/openzfs/module/zfs/dsl_synctask.c | 2 +- sys/contrib/openzfs/module/zfs/fm.c | 3 +- sys/contrib/openzfs/module/zfs/metaslab.c | 10 +- sys/contrib/openzfs/module/zfs/range_tree.c | 2 +- sys/contrib/openzfs/module/zfs/sa.c | 4 +- sys/contrib/openzfs/module/zfs/spa.c | 3 +- sys/contrib/openzfs/module/zfs/spa_config.c | 2 + sys/contrib/openzfs/module/zfs/spa_misc.c | 6 +- sys/contrib/openzfs/module/zfs/spa_stats.c | 6 +- sys/contrib/openzfs/module/zfs/txg.c | 21 +- sys/contrib/openzfs/module/zfs/vdev_indirect.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_initialize.c | 4 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 3 +- sys/contrib/openzfs/module/zfs/vdev_raidz_math.c | 2 - sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 6 +- sys/contrib/openzfs/module/zfs/vdev_removal.c | 10 +- sys/contrib/openzfs/module/zfs/vdev_trim.c | 4 +- sys/contrib/openzfs/module/zfs/zcp_get.c | 32 ++- sys/contrib/openzfs/module/zfs/zfs_log.c | 18 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 238 +++++++++++++++++--- sys/contrib/openzfs/module/zfs/zil.c | 12 +- sys/contrib/openzfs/module/zfs/zio.c | 16 +- sys/contrib/openzfs/module/zfs/zvol.c | 129 ++++++++++- sys/contrib/openzfs/scripts/update_authors.pl | 104 +++++++-- sys/contrib/openzfs/tests/runfiles/common.run | 19 +- sys/contrib/openzfs/tests/runfiles/linux.run | 4 - sys/contrib/openzfs/tests/runfiles/sanity.run | 6 +- .../tests/test-runner/bin/test-runner.py.in | 47 ++-- .../openzfs/tests/zfs-tests/cmd/Makefile.am | 2 +- .../tests/zfs-tests/cmd/file/file_fadvise.c | 32 ++- .../openzfs/tests/zfs-tests/include/libtest.shlib | 18 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 4 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 13 +- .../functional/alloc_class/alloc_class_016_pos.ksh | 60 +++++ .../tests/functional/bclone/bclone_common.kshlib | 7 - .../bclone/bclone_crossfs_corner_cases.ksh | 1 - .../bclone/bclone_crossfs_corner_cases_limited.ksh | 1 - .../functional/bclone/bclone_crossfs_data.ksh | 1 - .../functional/bclone/bclone_crossfs_embedded.ksh | 1 - .../functional/bclone/bclone_crossfs_hole.ksh | 1 - .../functional/bclone/bclone_diffprops_all.ksh | 1 - .../bclone/bclone_diffprops_checksum.ksh | 1 - .../bclone/bclone_diffprops_compress.ksh | 1 - .../functional/bclone/bclone_diffprops_copies.ksh | 1 - .../bclone/bclone_diffprops_recordsize.ksh | 1 - .../tests/functional/bclone/bclone_prop_sync.ksh | 1 - .../bclone/bclone_samefs_corner_cases.ksh | 2 - .../bclone/bclone_samefs_corner_cases_limited.ksh | 2 - .../tests/functional/bclone/bclone_samefs_data.ksh | 2 - .../functional/bclone/bclone_samefs_embedded.ksh | 2 - .../tests/functional/bclone/bclone_samefs_hole.ksh | 2 - .../block_cloning_clone_mmap_cached.ksh | 4 - .../block_cloning_clone_mmap_write.ksh | 4 - .../block_cloning/block_cloning_copyfilerange.ksh | 4 - .../block_cloning_copyfilerange_fallback.ksh | 4 - ...ock_cloning_copyfilerange_fallback_same_txg.ksh | 4 - .../block_cloning_copyfilerange_partial.ksh | 4 - .../block_cloning_disabled_copyfilerange.ksh | 4 - .../block_cloning/block_cloning_large_offset.ksh | 4 - .../block_cloning_lwb_buffer_overflow.ksh | 4 - .../block_cloning/block_cloning_replay.ksh | 4 - .../block_cloning_replay_encrypted.ksh | 4 - .../channel_program/lua_core/tst.encryption.ksh | 43 ++++ .../channel_program/lua_core/tst.encryption.zcp | 23 ++ .../channel_program/lua_core/tst.exists.ksh | 9 +- .../functional/cli_root/zfs_rewrite/cleanup.ksh | 26 +++ .../functional/cli_root/zfs_rewrite/setup.ksh | 28 +++ .../cli_root/zfs_rewrite/zfs_rewrite.ksh | 104 +++++++++ .../tests/functional/cp_files/cp_files_002_pos.ksh | 1 - .../functional/direct/dio_unaligned_block.ksh | 9 + ...fadvise_sequential.ksh => fadvise_willneed.ksh} | 4 +- .../tests/functional/failmode/cleanup.ksh | 30 +++ .../failmode/failmode_dmu_tx_continue.ksh | 102 +++++++++ .../functional/failmode/failmode_dmu_tx_wait.ksh | 98 +++++++++ .../zfs-tests/tests/functional/failmode/setup.ksh | 28 +++ .../tests/functional/rsend/send_leak_keymaps.ksh | 82 +++++++ .../tests/functional/stat/statx_dioalign.ksh | 11 + .../tests/functional/zvol/zvol_common.shlib | 8 + .../zvol/zvol_misc/zvol_misc_volmode.ksh | 58 +++-- .../functional/zvol/zvol_stress/zvol_stress.ksh | 18 +- sys/contrib/openzfs/udev/rules.d/69-vdev.rules.in | 1 + sys/contrib/openzfs/udev/vdev_id | 42 +++- sys/modules/zfs/zfs_config.h | 14 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 180 files changed, 3246 insertions(+), 1394 deletions(-) diff --cc cddl/lib/libzfs_core/Makefile index 8ce0a152852f,000000000000..bac81ca73497 mode 100644,000000..100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@@ -1,32 -1,0 +1,33 @@@ +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs + + +LIB= zfs_core +LIBADD= nvpair spl zutil +PACKAGE= libzfs + +INCS= libzfs_core.h +SRCS= libzfs_core.c \ + os/freebsd/libzfs_core_ioctl.c \ + zfs_ioctl_compat.c + +WARNS?= 2 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +.include diff --cc cddl/sbin/zfs/Makefile index b6ecfbe33ba3,000000000000..9a0a5198602e mode 100644,000000..100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@@ -1,79 -1,0 +1,80 @@@ +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +.PATH: ${ZFSTOP}/cmd/zfs +.PATH: ${ZFSTOP}/man/man7 +.PATH: ${ZFSTOP}/man/man8 +.PATH: ${ZFSTOP}/module/os/freebsd/spl + +PACKAGE= zfs +PROG= zfs +MAN= \ + zfs.8 \ + zfs-allow.8 \ + zfs-bookmark.8 \ + zfs-clone.8 \ + zfs-create.8 \ + zfs-destroy.8 \ + zfs-diff.8 \ + zfs-hold.8 \ + zfs-jail.8 \ + zfs-list.8 \ + zfs-load-key.8 \ + zfs-mount.8 \ + zfs-program.8 \ + zfs-project.8 \ + zfs-promote.8 \ + zfs-receive.8 \ + zfs-rename.8 \ ++ zfs-rewrite.8 \ + zfs-rollback.8 \ + zfs-send.8 \ + zfs-set.8 \ + zfs-share.8 \ + zfs-snapshot.8 \ + zfs-upgrade.8 \ + zfs-userspace.8 \ + zfs-wait.8 \ + zfsconcepts.7 \ + zfsprops.7 +MLINKS= \ + zfs-allow.8 zfs-unallow.8 \ + zfs-hold.8 zfs-release.8 \ + zfs-jail.8 zfs-unjail.8 \ + zfs-load-key.8 zfs-change-key.8 \ + zfs-load-key.8 zfs-unload-key.8 \ + zfs-mount.8 zfs-unmount.8 \ + zfs-receive.8 zfs-recv.8 \ + zfs-send.8 zfs-redact.8 \ + zfs-set.8 zfs-get.8 \ + zfs-set.8 zfs-inherit.8 \ + zfs-userspace.8 zfs-groupspace.8 \ + zfs-userspace.8 zfs-projectspace.8 +SRCS= \ + zfs_iter.c \ + zfs_iter.h \ + zfs_main.c \ + zfs_util.h \ + zfs_project.c \ + zfs_projectutil.h + +WARNS?= 2 + +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/include/os/freebsd \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs + +LIBADD= jail avl nvpair geom uutil zfs_core spl tpool zutil zfs m crypto +LDADD+= -pthread +.include + +CWARNFLAGS.zfs_main.c+= -Wno-unused-variable diff --cc sys/contrib/openzfs/.mailmap index 89d579e60d01,000000000000..b6d942c000b8 mode 100644,000000..100644 --- a/sys/contrib/openzfs/.mailmap +++ b/sys/contrib/openzfs/.mailmap @@@ -1,221 -1,0 +1,225 @@@ +# This file maps the name+email seen in a commit back to a canonical +# name+email. Git will replace the commit name/email with the canonical version +# wherever it sees it. +# +# If there is a commit in the history with a "wrong" name or email, list it +# here. If you regularly commit with an alternate name or email address and +# would like to ensure that you are always listed consistently in the repo, add +# mapping here. +# +# On the other hand, if you use multiple names or email addresses legitimately +# (eg you use a company email address for your paid OpenZFS work, and a +# personal address for your evening side projects), then don't map one to the +# other here. +# +# The most common formats are: +# +# Canonical Name +# Canonical Name +# Canonical Name Commit Name +# +# See https://git-scm.com/docs/gitmailmap for more info. + +# These maps are making names consistent where they have varied but the email +# address has never changed. In most cases, the full name is in the +# Signed-off-by of a commit with a matching author. +Ahelenia Ziemiańska +Ahelenia Ziemiańska +Alex John +Andreas Dilger +Andrew Walker +Benedikt Neuffer +Chengfei Zhu +ChenHao Lu <18302010006@fudan.edu.cn> +Chris Lindee +Colm Buckley +Crag Wang +Damian Szuberski +Daniel Kolesa +Debabrata Banerjee +Finix Yan +Gaurav Kumar +Gionatan Danti +Glenn Washburn +Gordan Bobic +Gregory Bartholomew +hedong zhang +Ilkka Sovanto +InsanePrawn +Jason Cohen +Jason Harmening +Jeremy Faulkner +Jinshan Xiong +John Poduska +Justin Scholz +Ka Ho Ng +Kash Pande +Kay Pedersen +KernelOfTruth +Liu Hua +Liu Qing +loli10K +Mart Frauenlob +Matthias Blankertz +Michael Gmelin +Olivier Mazouffre +Piotr Kubaj +Quentin Zdanis +Roberto Ricci +Rob Norris +Rob Norris +Sam Lunt +Sanjeev Bagewadi +Sebastian Wuerl +SHENGYI HONG +Stoiko Ivanov +Tamas TEVESZ +WHR +Yanping Gao +Youzhong Yang + +# Signed-off-by: overriding Author: +Alexander Ziaee - Ryan - Sietse ++Felix Schmidt ++Olivier Certner +Phil Sutter +poscat +Qiuhao Chen ++Ryan ++Sietse +Yuxin Wang +Zhenlei Huang + +# Commits from strange places, long ago +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Brian Behlendorf +Herb Wartens +Ned Bass +Tulsi Jain + +# Mappings from Github no-reply addresses +ajs124 +Alek Pinchuk ++Aleksandr Liber <61714074+AleksandrLiber@users.noreply.github.com> +Alexander Lobakin +Alexey Smirnoff +Allen Holl <65494904+allen-4@users.noreply.github.com> +Alphan Yılmaz +Ameer Hamza <106930537+ixhamza@users.noreply.github.com> +Andrew J. Hesford <48421688+ahesford@users.noreply.github.com>> +Andrew Sun +Aron Xu +Arun KV <65647132+arun-kv@users.noreply.github.com> +Ben Wolsieffer +bernie1995 <42413912+bernie1995@users.noreply.github.com> +Bojan Novković <72801811+bnovkov@users.noreply.github.com> +Boris Protopopov +Brad Forschinger +Brandon Thetford +buzzingwires <131118055+buzzingwires@users.noreply.github.com> +Cedric Maunoury <38213715+cedricmaunoury@users.noreply.github.com> +Charles Suh +Chris Peredun <126915832+chrisperedun@users.noreply.github.com> +Dacian Reece-Stremtan <35844628+dacianstremtan@users.noreply.github.com> +Damian Szuberski <30863496+szubersk@users.noreply.github.com> +Daniel Hiepler <32984777+heeplr@users.noreply.github.com> +Daniel Kobras +Daniel Reichelt +David Quigley +Dennis R. Friedrichsen <31087738+dennisfriedrichsen@users.noreply.github.com> +Dex Wood +DHE +Dmitri John Ledkov <19779+xnox@users.noreply.github.com> +Dries Michiels <32487486+driesmp@users.noreply.github.com> +Edmund Nadolski <137826107+ednadolski-ix@users.noreply.github.com> +Érico Nogueira <34201958+ericonr@users.noreply.github.com> +Fedor Uporov <60701163+fuporovvStack@users.noreply.github.com> +Felix Dörre +Felix Neumärker <34678034+xdch47@users.noreply.github.com> +Finix Yan ++Friedrich Weber <56110206+frwbr@users.noreply.github.com> +Gaurav Kumar +George Gaydarov +Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> +Gerardwx +Gian-Carlo DeFazio +Giuseppe Di Natale +Hajo Möller +Harry Mallon <1816667+hjmallon@users.noreply.github.com> +Hiếu Lê +Jake Howard +James Cowgill +Jaron Kent-Dobias +Jason King +Jeff Dike <52420226+jdike@users.noreply.github.com> +Jitendra Patidar <53164267+jsai20@users.noreply.github.com> +João Carlos Mendes Luís +John Eismeier <32205350+jeis2497052@users.noreply.github.com> +John L. Hammond <35266395+jhammond-intel@users.noreply.github.com> +John-Mark Gurney +John Ramsden +Jonathon Fernyhough <559369+jonathonf@users.noreply.github.com> +Jose Luis Duran +Justin Hibbits +Kevin Greene <104801862+kxgreene@users.noreply.github.com> +Kevin Jin <33590050+jxdking@users.noreply.github.com> +Kevin P. Fleming +Krzysztof Piecuch <3964215+pikrzysztof@users.noreply.github.com> +Kyle Evans +Laurențiu Nicola +loli10K +Lorenz Hüdepohl +Luís Henriques <73643340+lumigch@users.noreply.github.com> +Marcin Skarbek +Matt Fiddaman <81489167+matt-fidd@users.noreply.github.com> +Maxim Filimonov +Max Zettlmeißl <6818198+maxz@users.noreply.github.com> +Michael Niewöhner +Michael Zhivich <33133421+mzhivich@users.noreply.github.com> +MigeljanImeri <78048439+MigeljanImeri@users.noreply.github.com> +Mo Zhou <5723047+cdluminate@users.noreply.github.com> +Nick Mattis +omni <79493359+omnivagant@users.noreply.github.com> +Pablo Correa Gómez <32678034+pablofsf@users.noreply.github.com> +Paul Zuchowski <31706010+PaulZ-98@users.noreply.github.com> +Peter Ashford +Peter Dave Hello +Peter Wirdemo <4224155+pewo@users.noreply.github.com> +Petros Koutoupis +Ping Huang <101400146+hpingfs@users.noreply.github.com> +Piotr P. Stefaniak +Richard Allen <33836503+belperite@users.noreply.github.com> +Rich Ercolani <214141+rincebrain@users.noreply.github.com> +Rick Macklem <64620010+rmacklem@users.noreply.github.com> +Rob Wing <98866084+rob-wing@users.noreply.github.com> +Roman Strashkin +Ryan Hirasaki <4690732+RyanHir@users.noreply.github.com> +Samuel Wycliffe J <115969550+samwyc@users.noreply.github.com> +Samuel Wycliffe <50765275+npc203@users.noreply.github.com> +Savyasachee Jha +Scott Colby +Sean Eric Fagan +Spencer Kinny <30333052+Spencer-Kinny@users.noreply.github.com> +Srikanth N S <75025422+nssrikanth@users.noreply.github.com> +Stefan Lendl <1321542+stfl@users.noreply.github.com> +Thomas Bertschinger <101425190+bertschinger@users.noreply.github.com> +Thomas Geppert +Tim Crawford +Todd Seidelmann <18294602+seidelma@users.noreply.github.com> +Tom Matthews +Tony Perkins <62951051+tony-zfs@users.noreply.github.com> +Torsten Wörtwein +Tulsi Jain +Václav Skála <33496485+vaclavskala@users.noreply.github.com> +Vaibhav Bhanawat <88050553+vaibhav-delphix@users.noreply.github.com> +Vandana Rungta <46906819+vandanarungta@users.noreply.github.com> +Violet Purcell <66446404+vimproved@users.noreply.github.com> +Vipin Kumar Verma <75025470+vermavipinkumar@users.noreply.github.com> +Wolfgang Bumiller +XDTG <35128600+XDTG@users.noreply.github.com> +xtouqh <72357159+xtouqh@users.noreply.github.com> +Yuri Pankov <113725409+yuripv@users.noreply.github.com> +Yuri Pankov <82001006+yuripv@users.noreply.github.com> diff --cc sys/contrib/openzfs/config/kernel-timer.m4 index 000000000000,c89ea204e83d..c89ea204e83d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-timer.m4 +++ b/sys/contrib/openzfs/config/kernel-timer.m4 diff --cc sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h index 000000000000,baf9a7a95834..baf9a7a95834 mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h +++ b/sys/contrib/openzfs/lib/libzfs_core/libzfs_core_impl.h diff --cc sys/contrib/openzfs/man/man8/zfs-rewrite.8 index 000000000000,423d6d439e28..423d6d439e28 mode 000000,100644..100644 --- a/sys/contrib/openzfs/man/man8/zfs-rewrite.8 +++ b/sys/contrib/openzfs/man/man8/zfs-rewrite.8 diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh index 000000000000,2cd3c26492f3..2cd3c26492f3 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/alloc_class/alloc_class_016_pos.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh index 000000000000,448f91a70461..448f91a70461 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp index 000000000000,5b9896b2a9af..5b9896b2a9af mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/channel_program/lua_core/tst.encryption.zcp diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh index 000000000000,5e73dd34936e..5e73dd34936e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh index 000000000000,dddfdf8a4679..dddfdf8a4679 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh index 000000000000,d1c0b3c64c27..d1c0b3c64c27 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_rewrite/zfs_rewrite.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh index 000000000000,59d225388f47..59d225388f47 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/cleanup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh index 000000000000,f5f37b3f51bb..f5f37b3f51bb mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_continue.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh index 000000000000,88284942603e..88284942603e mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/failmode_dmu_tx_wait.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh index 000000000000,099c6306dbd5..099c6306dbd5 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/failmode/setup.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh index 000000000000,6ab8da6fd740..6ab8da6fd740 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/send_leak_keymaps.ksh diff --cc sys/modules/zfs/zfs_config.h index 86ccdbee2d5b,000000000000..039570c67af7 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,839 -1,0 +1,845 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* __assign_str() has one arg */ +/* #undef HAVE_1ARG_ASSIGN_STR */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* backtrace() is available */ +/* #undef HAVE_BACKTRACE */ + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* bdev_nr_bytes() is available */ +/* #undef HAVE_BDEV_NR_BYTES */ + +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* struct queue_limits has a features field */ +/* #undef HAVE_BLKDEV_QUEUE_LIMITS_FEATURES */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* backing_dev_info is available through queue gendisk */ +/* #undef HAVE_BLK_QUEUE_DISK_BDI */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* 3-arg dequeue_signal() takes a type argument */ +/* #undef HAVE_DEQUEUE_SIGNAL_3ARG_TYPE */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* dops->d_revalidate() takes 4 args */ +/* #undef HAVE_D_REVALIDATE_4ARGS */ + +/* Define to 1 if you have the 'execvpe' function. */ +#define HAVE_EXECVPE 1 + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* file->f_version exists */ +/* #undef HAVE_FILE_F_VERSION */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* GENHD_FL_EXT_DEVT flag is available */ +/* #undef HAVE_GENHD_FL_EXT_DEVT */ + +/* GENHD_FL_NO_PART flag is available */ +/* #undef HAVE_GENHD_FL_NO_PART */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the 'gettid' function. */ +/* #undef HAVE_GETTID */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + *** 540 LINES SKIPPED ***