Diffusion FreeBSD src repository 1f88aa09417f

zfs: merge openzfs/zfs@f3678d70f (master) into main
1f88aa09417f
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@f3678d70f (master) into main

Notable upstream pull request merges:

#12339 Read past end of argv array in zpool_do_import()
#12365 Fixes in persistent L2ARC
#12383 Fixes for KMSAN reports
#12425 Avoid small buffer copying on write
#12428 Fix unfortunate NULL in spa_update_dspace
#12446 Allow disabling of unmapped I/O on FreeBSD

Obtained from: OpenZFS
OpenZFS commit: f3678d70ff8f98d67caf377ec0326c9a6c7bcf29

Details

Provenance

mm	Authored on Aug 8 2021, 1:57 AM

Parents

rGf3678d70ff8f: Make get_key_material_file fail more verbosely
rGb0dafb1b6f35: src.conf.5: Regen after fe52b7f60ef4, PROFILE default off

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG1f88aa09417f: zfs: merge openzfs/zfs@f3678d70f (master) into main (authored by mm).Aug 8 2021, 2:01 AM

Merged Changes

f3678d70ff8f Make get_key_material_file fail more verbosely
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
ae1e40b32911 Enable /proc/diskstats for zvols
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
e1870be45049 Man zpool-scrub.8: describe sequential scrub
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
4357552785ac Modify checksum obtain method of QAT
Author
hedongzhang <h_d_zhang@163.com>
Browse Repository
No Builds
No Audits
46b2623586df Allow disabling of unmapped I/O on FreeBSD
Author
markj
Browse Repository
No Builds
No Audits
7eebcd2be6ac Avoid small buffer copying on write
Author
mav
Browse Repository
No Builds
No Audits
b72611f0f612 Fix format specifier warnings
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
4bd99c11d76b Remove overlooked __sun_attr__ based macros
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
9776838cfb8c Update ABI files with generated in CI worker
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
0b072481afe2 storeabi: add `no-corpus-path` flag
Author
George Melikov <mail@gmelikov.ru>
Browse Repository
No Builds
No Audits
273730d5b556 macOS can also set va_type
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
02601d8aa41d Move check_file to os/$platform section
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
dd3bda39cf7a Add comment on metaslab_class_throttle_reserve() locking
Author
mav
Browse Repository
No Builds
No Audits
bdd2bfd02c70 Assorted fixes for the performance tests
Author
John Wren Kennedy <john.kennedy@delphix.com>
Browse Repository
No Builds
No Audits
d8381f50d6ad Read past end of argv array in zpool_do_import()
Author
mahrens
Browse Repository
No Builds
No Audits
31c41aea9cd4 Add missing properties to zfs allow manpage
Author
Václav Skála <skala@vshosting.cz>
Browse Repository
No Builds
No Audits
ab8a8f074578 Fixes in persistent L2ARC
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
037af3e0d403 Remove NOTE(CONSTCOND) and note.h
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
2c69ba6444ad Normalise /*FALLTHR{OUGH,U}*/
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
90f1c3c94678 Prune /*NOTREACHED*/
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
5dbf6c5a66d3 Replace /*PRINTFLIKEn*/ with attribute(printf)
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
13737094503a Initialize dn_next_type[] in the dnode constructor
Author
markj
Browse Repository
No Builds
No Audits
3a185275a017 Zero pad bytes following TX_WRITE log data
Author
markj
Browse Repository
No Builds
No Audits
58714c281789 Zero pad bytes when allocating a ZIL record
Author
markj
Browse Repository
No Builds
No Audits
03363b2f86a9 Initialize all fields in zfs_log_xvattr()
Author
markj
Browse Repository
No Builds
No Audits
da27b8bc7f27 Initialize "autoreplace" in spa_ld_get_props()
Author
markj
Browse Repository
No Builds
No Audits
1c24bf966c37 Linux 5.14 compat: explicity assign set_page_dirty
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
f1ca7999bbf2 Fix unfortunate NULL in spa_update_dspace
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
1b06b03a7be8 Linux 5.14 compat: blk_alloc_disk()
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits

Changes (114)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

sys/

contrib/

openzfs/

cmd/

mount_zfs/

zdb/

zfs/

zgenhostid/

zhack/

zpool/

os/

freebsd/

zpool_vdev_os.c

linux/

zpool_vdev_os.c

zpool_influxdb/

zpool_influxdb.c

ztest/

config/

kernel-make-request-fn.m4

kernel-vfs-set_page_dirty.m4

include/

libuutil_impl.h

os/

freebsd/

spl/

sys/

linux/

spl/

sys/

sys/

lib/

libnvpair/

libspl/

include/

os/

linux/

sys/

libuutil/

libzfs/

libzfs_crypto.c

libzfs_dataset.c

libzfs_core/

libzfs_core.abi

libzfsbootenv/

libzfsbootenv.abi

libzpool/

libzutil/

man/

man8/

module/

icp/

algs/

skein/

core/

kcf_prov_tabs.c

io/

lua/

os/

freebsd/

zfs/

linux/

zfs/

zfs/

spa_log_spacemap.c

vdev_raidz_math.c

scripts/

tests/

runfiles/

test-runner/

bin/

zts-report.py.in

zfs-tests/

cmd/

mkbusy/

mkfile/

mmapwrite/

include/

tests/

functional/

checksum/

l2arc/

l2arc_arcstats_pos.ksh

	persist_l2arc_004_pos.ksh
	persist_l2arc_006_pos.ksh

	persist_l2arc_005_pos.ksh
	persist_l2arc_007_pos.ksh

persist_l2arc_006_pos.ksh

persist_l2arc_007_pos.ksh

persist_l2arc_008_pos.ksh

perf/

regression/

random_reads.ksh

random_readwrite.ksh

random_readwrite_fixed.ksh

random_writes.ksh

random_writes_zil.ksh

sequential_reads.ksh

sequential_reads_arc_cached.ksh

sequential_reads_arc_cached_clone.ksh

sequential_reads_dbuf_cached.ksh

sequential_writes.ksh

modules/

zfs/

rG1f88aa09417f

sys/contrib/openzfs/cmd/mount_zfs/mount_zfs.c

sys/contrib/openzfs/cmd/zdb/zdb.c

sys/contrib/openzfs/cmd/zfs/zfs_main.c

sys/contrib/openzfs/cmd/zgenhostid/zgenhostid.c

sys/contrib/openzfs/cmd/zhack/zhack.c

sys/contrib/openzfs/cmd/zpool/os/freebsd/zpool_vdev_os.c

sys/contrib/openzfs/cmd/zpool/os/linux/zpool_vdev_os.c

sys/contrib/openzfs/cmd/zpool/zpool_main.c

sys/contrib/openzfs/cmd/zpool/zpool_util.h

sys/contrib/openzfs/cmd/zpool/zpool_vdev.c

sys/contrib/openzfs/cmd/zpool_influxdb/zpool_influxdb.c

sys/contrib/openzfs/cmd/ztest/ztest.c

sys/contrib/openzfs/config/Abigail.am

sys/contrib/openzfs/config/kernel-make-request-fn.m4

sys/contrib/openzfs/config/kernel-vfs-set_page_dirty.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/include/libuutil.h

sys/contrib/openzfs/include/libuutil_impl.h

sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h

sys/contrib/openzfs/include/os/freebsd/spl/sys/cmn_err.h

sys/contrib/openzfs/include/os/linux/spl/sys/cmn_err.h

sys/contrib/openzfs/include/sys/Makefile.am

sys/contrib/openzfs/include/sys/abd.h

sys/contrib/openzfs/include/sys/abd_impl.h

sys/contrib/openzfs/include/sys/arc.h

sys/contrib/openzfs/include/sys/arc_impl.h

sys/contrib/openzfs/include/sys/bitops.h

sys/contrib/openzfs/include/sys/dbuf.h

sys/contrib/openzfs/include/sys/dnode.h

sys/contrib/openzfs/include/sys/dsl_dataset.h

sys/contrib/openzfs/include/sys/dsl_dir.h

sys/contrib/openzfs/include/sys/note.h

sys/contrib/openzfs/include/sys/spa.h

sys/contrib/openzfs/include/sys/vdev.h

sys/contrib/openzfs/include/sys/zfs_context.h

sys/contrib/openzfs/lib/libnvpair/libnvpair.abi

sys/contrib/openzfs/lib/libnvpair/libnvpair.c

sys/contrib/openzfs/lib/libspl/include/os/linux/sys/sysmacros.h

sys/contrib/openzfs/lib/libuutil/libuutil.abi

sys/contrib/openzfs/lib/libuutil/uu_pname.c

sys/contrib/openzfs/lib/libzfs/libzfs.abi

sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c

sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c

sys/contrib/openzfs/lib/libzfs/libzfs_util.c

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.abi

sys/contrib/openzfs/lib/libzfsbootenv/libzfsbootenv.abi

sys/contrib/openzfs/lib/libzpool/kernel.c

sys/contrib/openzfs/lib/libzutil/zutil_import.c

sys/contrib/openzfs/man/man8/zfs-allow.8

sys/contrib/openzfs/man/man8/zpool-scrub.8

sys/contrib/openzfs/module/icp/algs/skein/skein_impl.h

sys/contrib/openzfs/module/icp/core/kcf_prov_tabs.c

sys/contrib/openzfs/module/icp/io/aes.c

sys/contrib/openzfs/module/icp/io/skein_mod.c

sys/contrib/openzfs/module/lua/llex.c

sys/contrib/openzfs/module/lua/ltable.c

sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c

sys/contrib/openzfs/module/os/freebsd/zfs/vdev_geom.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/zio_crypt.c

sys/contrib/openzfs/module/os/linux/zfs/abd_os.c

sys/contrib/openzfs/module/os/linux/zfs/qat_compress.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_znode.c

sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c

sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c

sys/contrib/openzfs/module/zfs/abd.c

sys/contrib/openzfs/module/zfs/arc.c

sys/contrib/openzfs/module/zfs/ddt.c

sys/contrib/openzfs/module/zfs/dnode.c

sys/contrib/openzfs/module/zfs/dsl_prop.c

sys/contrib/openzfs/module/zfs/metaslab.c

sys/contrib/openzfs/module/zfs/spa.c

sys/contrib/openzfs/module/zfs/spa_log_spacemap.c

sys/contrib/openzfs/module/zfs/spa_misc.c

sys/contrib/openzfs/module/zfs/vdev.c

sys/contrib/openzfs/module/zfs/vdev_raidz_math.c

sys/contrib/openzfs/module/zfs/zfs_log.c

sys/contrib/openzfs/module/zfs/zfs_replay.c

sys/contrib/openzfs/module/zfs/zil.c

sys/contrib/openzfs/scripts/zfs-tests.sh

sys/contrib/openzfs/tests/runfiles/common.run

sys/contrib/openzfs/tests/test-runner/bin/zts-report.py.in

sys/contrib/openzfs/tests/zfs-tests/cmd/mkbusy/Makefile.am

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/mmapwrite/mmapwrite.c

sys/contrib/openzfs/tests/zfs-tests/include/tunables.cfg

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/l2arc/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/l2arc_arcstats_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_004_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_005_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_006_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_007_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/l2arc/persist_l2arc_008_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/perf.shlib

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/random_reads.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/random_readwrite.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/random_readwrite_fixed.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/random_writes.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/random_writes_zil.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/sequential_reads.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/sequential_reads_arc_cached_clone.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/sequential_reads_dbuf_cached.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/sequential_writes.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/perf/regression/setup.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h