]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
zfs: merge openzfs/zfs@bc3f12bfa (master) into main
authorMartin Matuska <mm@FreeBSD.org>
Tue, 29 Mar 2022 10:07:34 +0000 (12:07 +0200)
committerMartin Matuska <mm@FreeBSD.org>
Tue, 29 Mar 2022 10:07:34 +0000 (12:07 +0200)
commitda5137abdf463bb5fee85061958a14dd12bc043e
treeffffad3f1648c73607c327cf262a2033075f4563
parentae6aa2d43daa6276dd18dc974a1c5b7c15264615
parentbc3f12bfac152a0c28951cec92340ba14f9ccee9
zfs: merge openzfs/zfs@bc3f12bfa (master) into main

Notable upstream pull request merges:
  #12083 libzfs: FreeBSD doesn't resize partitions for you
  #13106 add physical device size to SIZE column in 'zpool list -v'
  #13158 Allow zfs send to exclude datasets
  #13190 module: zfs: zio_inject: zio_match_handler: don't << -1
  #13219 FreeBSD: add missing replay check to an assert in zfs_xvattr_set
  #13220 module: freebsd: avoid a taking a destroyed lock in zfs_zevent bits
  #13221 Fix ACL checks for NFS kernel server

Obtained from: OpenZFS
OpenZFS commit: bc3f12bfac152a0c28951cec92340ba14f9ccee9
285 files changed:
sys/conf/kern.pre.mk
sys/contrib/openzfs/.github/workflows/zfs-tests-functional.yml
sys/contrib/openzfs/.github/workflows/zfs-tests-sanity.yml
sys/contrib/openzfs/META
sys/contrib/openzfs/Makefile.am
sys/contrib/openzfs/cmd/raidz_test/raidz_bench.c
sys/contrib/openzfs/cmd/raidz_test/raidz_test.c
sys/contrib/openzfs/cmd/raidz_test/raidz_test.h
sys/contrib/openzfs/cmd/zdb/zdb.c
sys/contrib/openzfs/cmd/zed/agents/fmd_api.c
sys/contrib/openzfs/cmd/zed/agents/fmd_api.h
sys/contrib/openzfs/cmd/zed/agents/fmd_serd.c
sys/contrib/openzfs/cmd/zed/agents/zfs_diagnosis.c
sys/contrib/openzfs/cmd/zfs/zfs_iter.c
sys/contrib/openzfs/cmd/zfs/zfs_main.c
sys/contrib/openzfs/cmd/zfs/zfs_project.c
sys/contrib/openzfs/cmd/zgenhostid/zgenhostid.c
sys/contrib/openzfs/cmd/zhack/zhack.c
sys/contrib/openzfs/cmd/zinject/translate.c
sys/contrib/openzfs/cmd/zinject/zinject.c
sys/contrib/openzfs/cmd/zpool/os/linux/zpool_vdev_os.c
sys/contrib/openzfs/cmd/zpool/zpool_iter.c
sys/contrib/openzfs/cmd/zpool/zpool_main.c
sys/contrib/openzfs/cmd/zpool/zpool_util.c
sys/contrib/openzfs/cmd/zstream/zstream.c
sys/contrib/openzfs/cmd/zstream/zstream_dump.c
sys/contrib/openzfs/cmd/zstream/zstream_redup.c
sys/contrib/openzfs/cmd/zstream/zstream_token.c
sys/contrib/openzfs/cmd/ztest/ztest.c
sys/contrib/openzfs/config/Rules.am
sys/contrib/openzfs/config/always-arch.m4
sys/contrib/openzfs/config/deb.am
sys/contrib/openzfs/config/kernel-add-disk.m4
sys/contrib/openzfs/config/kernel-bio.m4
sys/contrib/openzfs/config/kernel-fpu.m4
sys/contrib/openzfs/config/kernel-revalidate-disk-size.m4
sys/contrib/openzfs/config/kernel-zero_page.m4
sys/contrib/openzfs/config/kernel.m4
sys/contrib/openzfs/config/user-aio.h.m4
sys/contrib/openzfs/config/user-libaio.m4
sys/contrib/openzfs/config/user.m4
sys/contrib/openzfs/contrib/pam_zfs_key/pam_zfs_key.c
sys/contrib/openzfs/include/libuutil.h
sys/contrib/openzfs/include/os/freebsd/spl/sys/Makefile.am
sys/contrib/openzfs/include/os/freebsd/spl/sys/callb.h
sys/contrib/openzfs/include/os/freebsd/spl/sys/cred.h
sys/contrib/openzfs/include/os/freebsd/spl/sys/sid.h
sys/contrib/openzfs/include/os/linux/kernel/linux/simd_x86.h
sys/contrib/openzfs/include/os/linux/spl/sys/Makefile.am
sys/contrib/openzfs/include/os/linux/spl/sys/cred.h
sys/contrib/openzfs/include/os/linux/spl/sys/string.h
sys/contrib/openzfs/include/os/linux/spl/sys/thread.h
sys/contrib/openzfs/include/sys/efi_partition.h
sys/contrib/openzfs/include/sys/fs/zfs.h
sys/contrib/openzfs/include/sys/xvattr.h
sys/contrib/openzfs/include/sys/zfs_context.h
sys/contrib/openzfs/lib/libefi/rdwr_efi.c
sys/contrib/openzfs/lib/libnvpair/libnvpair_json.c
sys/contrib/openzfs/lib/libshare/libshare.c
sys/contrib/openzfs/lib/libshare/os/freebsd/smb.c
sys/contrib/openzfs/lib/libshare/os/linux/nfs.c
sys/contrib/openzfs/lib/libshare/os/linux/smb.c
sys/contrib/openzfs/lib/libspl/include/sys/Makefile.am
sys/contrib/openzfs/lib/libspl/include/sys/kstat.h
sys/contrib/openzfs/lib/libspl/include/sys/string.h
sys/contrib/openzfs/lib/libuutil/uu_pname.c
sys/contrib/openzfs/lib/libzfs/libzfs_config.c
sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c
sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c
sys/contrib/openzfs/lib/libzfs/libzfs_import.c
sys/contrib/openzfs/lib/libzfs/libzfs_iter.c
sys/contrib/openzfs/lib/libzfs/libzfs_mount.c
sys/contrib/openzfs/lib/libzfs/libzfs_pool.c
sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c
sys/contrib/openzfs/lib/libzfs/libzfs_status.c
sys/contrib/openzfs/lib/libzfs/libzfs_util.c
sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_mount_os.c
sys/contrib/openzfs/lib/libzfs/os/linux/libzfs_pool_os.c
sys/contrib/openzfs/lib/libzpool/kernel.c
sys/contrib/openzfs/lib/libzpool/taskq.c
sys/contrib/openzfs/lib/libzutil/os/linux/zutil_device_path_os.c
sys/contrib/openzfs/lib/libzutil/os/linux/zutil_import_os.c
sys/contrib/openzfs/lib/libzutil/zutil_device_path.c
sys/contrib/openzfs/lib/libzutil/zutil_import.c
sys/contrib/openzfs/man/man7/zpoolconcepts.7
sys/contrib/openzfs/man/man8/zdb.8
sys/contrib/openzfs/man/man8/zfs-allow.8
sys/contrib/openzfs/man/man8/zfs-bookmark.8
sys/contrib/openzfs/man/man8/zfs-clone.8
sys/contrib/openzfs/man/man8/zfs-create.8
sys/contrib/openzfs/man/man8/zfs-destroy.8
sys/contrib/openzfs/man/man8/zfs-diff.8
sys/contrib/openzfs/man/man8/zfs-list.8
sys/contrib/openzfs/man/man8/zfs-promote.8
sys/contrib/openzfs/man/man8/zfs-receive.8
sys/contrib/openzfs/man/man8/zfs-rename.8
sys/contrib/openzfs/man/man8/zfs-rollback.8
sys/contrib/openzfs/man/man8/zfs-send.8
sys/contrib/openzfs/man/man8/zfs-set.8
sys/contrib/openzfs/man/man8/zfs-snapshot.8
sys/contrib/openzfs/man/man8/zfs.8
sys/contrib/openzfs/man/man8/zpool-add.8
sys/contrib/openzfs/man/man8/zpool-create.8
sys/contrib/openzfs/man/man8/zpool-destroy.8
sys/contrib/openzfs/man/man8/zpool-export.8
sys/contrib/openzfs/man/man8/zpool-import.8
sys/contrib/openzfs/man/man8/zpool-iostat.8
sys/contrib/openzfs/man/man8/zpool-list.8
sys/contrib/openzfs/man/man8/zpool-remove.8
sys/contrib/openzfs/man/man8/zpool-scrub.8
sys/contrib/openzfs/man/man8/zpool-status.8
sys/contrib/openzfs/man/man8/zpool-upgrade.8
sys/contrib/openzfs/man/man8/zpool.8
sys/contrib/openzfs/module/Makefile.bsd
sys/contrib/openzfs/module/icp/algs/aes/aes_impl.c
sys/contrib/openzfs/module/icp/algs/edonr/edonr.c
sys/contrib/openzfs/module/icp/algs/modes/cbc.c
sys/contrib/openzfs/module/icp/algs/modes/ccm.c
sys/contrib/openzfs/module/icp/algs/modes/ctr.c
sys/contrib/openzfs/module/icp/algs/modes/ecb.c
sys/contrib/openzfs/module/icp/algs/modes/gcm.c
sys/contrib/openzfs/module/icp/algs/modes/modes.c
sys/contrib/openzfs/module/icp/algs/sha2/sha2.c
sys/contrib/openzfs/module/icp/algs/skein/skein.c
sys/contrib/openzfs/module/icp/algs/skein/skein_impl.h
sys/contrib/openzfs/module/icp/algs/skein/skein_port.h
sys/contrib/openzfs/module/icp/api/kcf_ctxops.c
sys/contrib/openzfs/module/icp/core/kcf_mech_tabs.c
sys/contrib/openzfs/module/icp/core/kcf_prov_lib.c
sys/contrib/openzfs/module/icp/io/aes.c
sys/contrib/openzfs/module/icp/io/sha2_mod.c
sys/contrib/openzfs/module/icp/io/skein_mod.c
sys/contrib/openzfs/module/lua/ldo.c
sys/contrib/openzfs/module/nvpair/nvpair.c
sys/contrib/openzfs/module/os/freebsd/spl/acl_common.c
sys/contrib/openzfs/module/os/freebsd/spl/sha256c.c
sys/contrib/openzfs/module/os/freebsd/spl/sha512c.c
sys/contrib/openzfs/module/os/freebsd/spl/spl_acl.c
sys/contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c
sys/contrib/openzfs/module/os/freebsd/spl/spl_vfs.c
sys/contrib/openzfs/module/os/freebsd/spl/spl_zlib.c
sys/contrib/openzfs/module/os/freebsd/spl/spl_zone.c
sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c
sys/contrib/openzfs/module/os/freebsd/zfs/crypto_os.c
sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c
sys/contrib/openzfs/module/os/freebsd/zfs/hkdf.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_acl.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
sys/contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c
sys/contrib/openzfs/module/os/linux/spl/spl-cred.c
sys/contrib/openzfs/module/os/linux/spl/spl-generic.c
sys/contrib/openzfs/module/os/linux/spl/spl-thread.c
sys/contrib/openzfs/module/os/linux/zfs/abd_os.c
sys/contrib/openzfs/module/os/linux/zfs/policy.c
sys/contrib/openzfs/module/os/linux/zfs/qat_crypt.c
sys/contrib/openzfs/module/os/linux/zfs/vdev_disk.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_dir.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_vfsops.c
sys/contrib/openzfs/module/os/linux/zfs/zfs_znode.c
sys/contrib/openzfs/module/os/linux/zfs/zio_crypt.c
sys/contrib/openzfs/module/os/linux/zfs/zpl_inode.c
sys/contrib/openzfs/module/os/linux/zfs/zpl_xattr.c
sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c
sys/contrib/openzfs/module/unicode/u8_textprep.c
sys/contrib/openzfs/module/zcommon/zfs_deleg.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_aarch64_neon.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_avx512.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_intel.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_sse.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_superscalar.c
sys/contrib/openzfs/module/zcommon/zfs_fletcher_superscalar4.c
sys/contrib/openzfs/module/zcommon/zfs_prop.c
sys/contrib/openzfs/module/zfs/aggsum.c
sys/contrib/openzfs/module/zfs/arc.c
sys/contrib/openzfs/module/zfs/blkptr.c
sys/contrib/openzfs/module/zfs/bpobj.c
sys/contrib/openzfs/module/zfs/btree.c
sys/contrib/openzfs/module/zfs/dataset_kstats.c
sys/contrib/openzfs/module/zfs/dbuf.c
sys/contrib/openzfs/module/zfs/ddt.c
sys/contrib/openzfs/module/zfs/dmu.c
sys/contrib/openzfs/module/zfs/dmu_objset.c
sys/contrib/openzfs/module/zfs/dmu_recv.c
sys/contrib/openzfs/module/zfs/dmu_redact.c
sys/contrib/openzfs/module/zfs/dmu_send.c
sys/contrib/openzfs/module/zfs/dmu_traverse.c
sys/contrib/openzfs/module/zfs/dnode.c
sys/contrib/openzfs/module/zfs/dnode_sync.c
sys/contrib/openzfs/module/zfs/dsl_bookmark.c
sys/contrib/openzfs/module/zfs/dsl_crypt.c
sys/contrib/openzfs/module/zfs/dsl_dataset.c
sys/contrib/openzfs/module/zfs/dsl_deadlist.c
sys/contrib/openzfs/module/zfs/dsl_scan.c
sys/contrib/openzfs/module/zfs/edonr_zfs.c
sys/contrib/openzfs/module/zfs/gzip.c
sys/contrib/openzfs/module/zfs/hkdf.c
sys/contrib/openzfs/module/zfs/metaslab.c
sys/contrib/openzfs/module/zfs/mmp.c
sys/contrib/openzfs/module/zfs/range_tree.c
sys/contrib/openzfs/module/zfs/sa.c
sys/contrib/openzfs/module/zfs/skein_zfs.c
sys/contrib/openzfs/module/zfs/spa.c
sys/contrib/openzfs/module/zfs/spa_checkpoint.c
sys/contrib/openzfs/module/zfs/spa_misc.c
sys/contrib/openzfs/module/zfs/space_map.c
sys/contrib/openzfs/module/zfs/txg.c
sys/contrib/openzfs/module/zfs/vdev.c
sys/contrib/openzfs/module/zfs/vdev_draid.c
sys/contrib/openzfs/module/zfs/vdev_indirect.c
sys/contrib/openzfs/module/zfs/vdev_indirect_births.c
sys/contrib/openzfs/module/zfs/vdev_indirect_mapping.c
sys/contrib/openzfs/module/zfs/vdev_initialize.c
sys/contrib/openzfs/module/zfs/vdev_label.c
sys/contrib/openzfs/module/zfs/vdev_raidz.c
sys/contrib/openzfs/module/zfs/vdev_rebuild.c
sys/contrib/openzfs/module/zfs/vdev_removal.c
sys/contrib/openzfs/module/zfs/vdev_trim.c
sys/contrib/openzfs/module/zfs/zap.c
sys/contrib/openzfs/module/zfs/zap_leaf.c
sys/contrib/openzfs/module/zfs/zap_micro.c
sys/contrib/openzfs/module/zfs/zfs_fm.c
sys/contrib/openzfs/module/zfs/zfs_log.c
sys/contrib/openzfs/module/zfs/zfs_replay.c
sys/contrib/openzfs/module/zfs/zfs_sa.c
sys/contrib/openzfs/module/zfs/zfs_vnops.c
sys/contrib/openzfs/module/zfs/zil.c
sys/contrib/openzfs/module/zfs/zio.c
sys/contrib/openzfs/module/zfs/zio_checksum.c
sys/contrib/openzfs/module/zfs/zio_inject.c
sys/contrib/openzfs/module/zfs/zthr.c
sys/contrib/openzfs/module/zstd/Makefile.in
sys/contrib/openzfs/module/zstd/include/zstd_compat_wrapper.h
sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in
sys/contrib/openzfs/rpm/generic/zfs.spec.in
sys/contrib/openzfs/scripts/zfs-tests.sh
sys/contrib/openzfs/tests/runfiles/common.run
sys/contrib/openzfs/tests/runfiles/sanity.run
sys/contrib/openzfs/tests/test-runner/bin/test-runner.py.in
sys/contrib/openzfs/tests/test-runner/include/logapi.shlib
sys/contrib/openzfs/tests/zfs-tests/cmd/draid/draid.c
sys/contrib/openzfs/tests/zfs-tests/cmd/file_common.h
sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c
sys/contrib/openzfs/tests/zfs-tests/cmd/mkbusy/mkbusy.c
sys/contrib/openzfs/tests/zfs-tests/cmd/mkfile/mkfile.c
sys/contrib/openzfs/tests/zfs-tests/cmd/nvlist_to_lua/nvlist_to_lua.c
sys/contrib/openzfs/tests/zfs-tests/cmd/randwritecomp/randwritecomp.c
sys/contrib/openzfs/tests/zfs-tests/cmd/rename_dir/rename_dir.c
sys/contrib/openzfs/tests/zfs-tests/cmd/rm_lnkcnt_zero_file/rm_lnkcnt_zero_file.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/checksum/edonr_test.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/checksum/sha2_test.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/checksum/skein_test.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_001_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_002_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_005_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_006_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_get/zfs_get_007_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_wait/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_wait/zfs_wait_getsubopt.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get_004_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_wait/zpool_wait_usage.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_user/zfs_list/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_user/zfs_list/zfs_list_005_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/ctime/ctime.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/history/history_007_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/hkdf/hkdf_test.c
sys/contrib/openzfs/tests/zfs-tests/tests/functional/largest_pool/largest_pool_001_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_lun_expsz.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/Makefile.am
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_011_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_025_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_026_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_027_pos.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_028_neg.ksh
sys/contrib/openzfs/tests/zfs-tests/tests/functional/rsend/rsend_029_neg.ksh
sys/modules/zfs/Makefile