Diffusion FreeBSD src repository 681ce946f33e

zfs: merge openzfs/zfs@f291fa658 (master) into main
681ce946f33e
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Notable upstream pull request merges:

#11711 Vdev Properties Feature
#12717 VOP_RENAME fixes for FreeBSD
#12746 Enable strict hole reporting by default
#12770 ZFS send/recv with ashift 9->12 leads to data corruption
#12828 FreeBSD: Add vop_standard_writecount_nomsyn
#12828 zfs: Fix a deadlock between page busy and the teardown lock
#12828 FreeBSD: Catch up with more VFS changes

Obtained from: OpenZFS
OpenZFS commit: f291fa658efd146540b03ce386133632bde237bf

Details

Provenance

mm	Authored on Dec 16 2021, 1:38 PM

Parents

rG858ed097c4cd: ida: plug set-but-not-used vars
rGf291fa658efd: t/z_diff/socket, zfs: main: fix unused argument warnings, ARGSUSED tags

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rG681ce946f33e: zfs: merge openzfs/zfs@f291fa658 (master) into main (authored by mm).Dec 16 2021, 1:38 PM

Merged Changes

f291fa658efd t/z_diff/socket, zfs: main: fix unused argument warnings, ARGSUSED tags
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
b7ef2340c20e libzfs: diff: simplify superfluous stdio
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
9bdf0c592b7e libzfs: diff: print_what() can return the symbol => get_what()
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
a72129edcb73 libzfs: diff: stream_bytes: use fputc, %hho formats chars
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
1cfb6ef36eb7 libzfs: zpool_set_vdev_prop: remove unused vprop
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
9e184b7c35e5 linux: libspl: getmntany: remove unused argument
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
344bbc82e705 zfs, libzfs: diff: accept -h/ZFS_DIFF_NO_MANGLE, disabling path escaping
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
f04b97620059 Add init script to load keys
Author
ogelpre <github@itfriend.de>
Browse Repository
No Builds
No Audits
4a5b6ced4199 zfs-dkms rpm: Fix scriptlets dependencies
Author
Till Maas <opensource@till.name>
Browse Repository
No Builds
No Audits
23cee221b7e0 FreeBSD: Add vop_standard_writecount_nomsync
Author
freqlabs
Browse Repository
No Builds
No Audits
cdf74673bc79 zfs: Fix a deadlock between page busy and the teardown lock
Author
markj
Revisions
D32931: zfs: Fix a deadlock between page busy and the teardown lock
Browse Repository
No Builds
No Audits
d172264d1ced FreeBSD: Catch up with more VFS changes
Author
freqlabs
Browse Repository
No Builds
No Audits
510885a84ce8 FreeBSD supports edonr follow up
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
9699e45d5778 Linux 5.15 compat: META (#12824)
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5ece420f031b contrib/bash_completion.d: fix error spew from __zfs_match_snapshot()
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
a78f19d3ec8e Linux 5.16: Resolve ZSTD_isError symbol collision in Linux kernel
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
1e767532f200 Linux 5.16: The blk-cgroup.h header is where struct blkcg_gq is defined
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
d08b99aca04d Linux 5.16: bio_set_dev is no longer a helper macro
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
f6e22561d21a Linux 5.16: type member of iov_iter renamed iter_type
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
435a451e5c5e Linux 5.16: block_device_operations->submit_bio now returns void
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
376027331d7e ZFS send/recv with ashift 9->12 leads to data corruption
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
b6fc42b5e1ae Update "tests/README.md"
Author
Arshad Hussain <arshad.hussain@aeoncomputing.com>
Browse Repository
No Builds
No Audits
795075e63803 Add `const` to nvlist functions to properly expose their real behavior
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
14ba514af611 ZTS: import_rewind_device_replaced reliably fails
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
df42e20ac68e Corrected a case where we could read uninited ABD memory
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
ddc026f59ba3 Strip colons from all test result filenames
Author
John Wren Kennedy <john.kennedy@delphix.com>
Browse Repository
No Builds
No Audits
77e2756de08c Linux 5.13 compat: retry zvol_open() when contended
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
31d2f42b2a55 Temporarily remove tests from sanity runfile
Author
John Wren Kennedy <john.kennedy@delphix.com>
Browse Repository
No Builds
No Audits
2320e6eb4302 Add zfs-test facility to automatically rerun failing tests
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits
861dca065e3b get_key_material: fix style
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
85638aa87003 get_key_material: skip passphrase validation when loading keys
Author
Harald van Dijk <harald@gigawatt.nl>
Browse Repository
No Builds
No Audits
4234812d1a20 pam_zfs_key: tests: check if zfs load-key works on short passphrases
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
307db9282309 pam_zfs_key: tests: clean up the generated pam service config file
Author
Attila Fülöp <attila@fueloep.org>
Browse Repository
No Builds
No Audits
b5c16861e9fa Remove REMAKE_INITRD
Author
jokersus <lolivampireslave@gmail.com>
Browse Repository
No Builds
No Audits
05b3eb6d2320 Default to zfs_dmu_offset_next_sync=1
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5dc6fc2b73bf Stop segfaulting on unmount error case
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
547df816418f Code cleanups
Author
pjd
Browse Repository
No Builds
No Audits
cfc62062ae14 Replace wrong occurrences of `affect` by `effect` in the man pages
Author
maxz <6818198+maxz@users.noreply.github.com>
Browse Repository
No Builds
No Audits
c5ccbbdcf652 Allow printing special vdev metaslab groups
Author
rincebrain_gmail.com
Browse Repository
No Builds
No Audits
34eef3e9a7a7 Pass `--enable=all` to shellcheck within contrib/
Author
Damian Szuberski <30863496+szubersk@users.noreply.github.com>
Browse Repository
No Builds
No Audits
4325de09cd29 etc/systemd/zfs-mount-generator: serialise, handle keylocation=http[s]://
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
2a673e76a928 Vdev Properties Feature
Author
allanjude
Browse Repository
No Builds
No Audits
5f64bf7fdeeb Fix typo in zpool.8
Author
pstef
Browse Repository
No Builds
No Audits
75b309a9384c Linux 5.16 compat: asm/fpu/xcr.h is new location for xgetbv/xsetbv
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
c0fb44c50609 Linux 5.16: wait_on_page_bit() no longer available to modules
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
ded851b2e09b Fix several bugs in the FreeBSD rename VOP implementation
Author
markj
Browse Repository
No Builds
No Audits
f9e39f98a0f6 Add notes to system_taskq
Author
pcd_delphix.com
Browse Repository
No Builds
No Audits

Changes (146)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

sys/

contrib/

openzfs/

.github/

workflows/

zfs-tests-functional.yml

zfs-tests-sanity.yml

cmd/

zdb/

zed/

agents/

zfs/

zpool/

ztest/

config/

kernel-blkdev.m4

kernel-pagemap-folio_wait_bit.m4

kernel-vfs-iov_iter.m4

contrib/

bash_completion.d/

bpftrace/

dracut/

02zfsexpandknowledge/

90zfs/

export-zfs.sh.in

import-opts-generator.sh.in

module-setup.sh.in

parse-zfs.sh.in

initramfs/

hooks/

scripts/

local-top/

pyzfs/

libzfs_core/

bindings/

etc/

default/

init.d/

zfs-load-key.in

systemd/

system-generators/

zfs-mount-generator.c

zfs/

zfs-functions.in

include/

os/

linux/

kernel/

linux/

sys/

fs/

lib/

libnvpair/

libspl/

os/

linux/

libuutil/

libzfs/

libzfs_crypto.c

os/

freebsd/

libzfs_compat.c

libzfs_core/

libzfs_core.abi

libzfsbootenv/

libzfsbootenv.abi

libzpool/

libzutil/

man/

man4/

man7/

man8/

zfs-mount-generator.8.in

module/

nvpair/

os/

freebsd/

spl/

zfs/

linux/

spl/

zfs/

zcommon/

zfeature_common.c

zfs/

zstd/

include/

zstd_compat_wrapper.h

lib/

rpm/

generic/

zfs-dkms.spec.in

scripts/

tests/

runfiles/

test-runner/

bin/

test-runner.py.in

zts-report.py.in

zfs-tests/

cmd/

libzfs_input_check/

libzfs_input_check.c

nvlist_to_lua/

nvlist_to_lua.c

tests/

functional/

cli_root/

zfs_diff/

zfs_diff_cliargs.ksh

zfs_diff_mangle.ksh

pam/

pam_nounmount.ksh

pam_short_password.ksh

utilities.kshlib

modules/

zfs/

rG681ce946f33e

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/cmd/zdb/zdb.c

sys/contrib/openzfs/cmd/zed/agents/fmd_api.c

sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c

sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c

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

sys/contrib/openzfs/cmd/zpool/zpool_iter.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/ztest/ztest.c

sys/contrib/openzfs/config/Shellcheck.am

sys/contrib/openzfs/config/kernel-bio.m4

sys/contrib/openzfs/config/kernel-blkdev.m4

sys/contrib/openzfs/config/kernel-fpu.m4

sys/contrib/openzfs/config/kernel-pagemap-folio_wait_bit.m4

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

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/contrib/Makefile.am

sys/contrib/openzfs/contrib/bash_completion.d/Makefile.am

sys/contrib/openzfs/contrib/bash_completion.d/zfs.in

sys/contrib/openzfs/contrib/bpftrace/Makefile.am

sys/contrib/openzfs/contrib/dracut/02zfsexpandknowledge/Makefile.am

sys/contrib/openzfs/contrib/dracut/90zfs/Makefile.am

sys/contrib/openzfs/contrib/dracut/90zfs/export-zfs.sh.in

sys/contrib/openzfs/contrib/dracut/90zfs/import-opts-generator.sh.in

sys/contrib/openzfs/contrib/dracut/90zfs/module-setup.sh.in

sys/contrib/openzfs/contrib/dracut/90zfs/parse-zfs.sh.in

sys/contrib/openzfs/contrib/dracut/90zfs/zfs-lib.sh.in

sys/contrib/openzfs/contrib/initramfs/Makefile.am

sys/contrib/openzfs/contrib/initramfs/hooks/Makefile.am

sys/contrib/openzfs/contrib/initramfs/hooks/zfs.in

sys/contrib/openzfs/contrib/initramfs/scripts/Makefile.am

sys/contrib/openzfs/contrib/initramfs/scripts/local-top/Makefile.am

sys/contrib/openzfs/contrib/initramfs/scripts/zfs

sys/contrib/openzfs/contrib/pyzfs/libzfs_core/_constants.py

sys/contrib/openzfs/contrib/pyzfs/libzfs_core/bindings/libnvpair.py

sys/contrib/openzfs/etc/default/Makefile.am

sys/contrib/openzfs/etc/default/zfs.in

sys/contrib/openzfs/etc/init.d/.gitignore

sys/contrib/openzfs/etc/init.d/Makefile.am

sys/contrib/openzfs/etc/init.d/README.md

sys/contrib/openzfs/etc/init.d/zfs-load-key.in

sys/contrib/openzfs/etc/systemd/system-generators/zfs-mount-generator.c

sys/contrib/openzfs/etc/zfs/zfs-functions.in

sys/contrib/openzfs/include/libzfs.h

sys/contrib/openzfs/include/libzfs_core.h

sys/contrib/openzfs/include/os/linux/kernel/linux/simd_x86.h

sys/contrib/openzfs/include/sys/fs/zfs.h

sys/contrib/openzfs/include/sys/nvpair.h

sys/contrib/openzfs/include/sys/nvpair_impl.h

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

sys/contrib/openzfs/include/sys/spa_impl.h

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

sys/contrib/openzfs/include/sys/vdev_impl.h

sys/contrib/openzfs/include/sys/zfs_sysfs.h

sys/contrib/openzfs/include/zfs_prop.h

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

sys/contrib/openzfs/lib/libspl/os/linux/getmntany.c

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

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

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

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

sys/contrib/openzfs/lib/libzfs/libzfs_impl.h

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

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

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

sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c

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

sys/contrib/openzfs/lib/libzfs_core/libzfs_core.c

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

sys/contrib/openzfs/lib/libzfsbootenv/lzbe_pair.c

sys/contrib/openzfs/lib/libzpool/Makefile.am

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

sys/contrib/openzfs/man/man4/zfs.4

sys/contrib/openzfs/man/man7/vdevprops.7

sys/contrib/openzfs/man/man8/zdb.8

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

sys/contrib/openzfs/man/man8/zfs-mount-generator.8.in

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

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

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

sys/contrib/openzfs/module/Makefile.bsd

sys/contrib/openzfs/module/nvpair/fnvpair.c

sys/contrib/openzfs/module/nvpair/nvpair.c

sys/contrib/openzfs/module/os/freebsd/spl/spl_taskq.c

sys/contrib/openzfs/module/os/freebsd/zfs/spa_os.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/linux/spl/spl-taskq.c

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

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

sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.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/zcommon/zfeature_common.c

sys/contrib/openzfs/module/zcommon/zfs_prop.c

sys/contrib/openzfs/module/zcommon/zpool_prop.c

sys/contrib/openzfs/module/zcommon/zprop_common.c

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

sys/contrib/openzfs/module/zstd/include/zstd_compat_wrapper.h

sys/contrib/openzfs/module/zstd/lib/zstd.c

sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in

sys/contrib/openzfs/rpm/generic/zfs.spec.in

sys/contrib/openzfs/scripts/Makefile.am

sys/contrib/openzfs/scripts/dkms.mkconf

sys/contrib/openzfs/scripts/mancheck.sh

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

sys/contrib/openzfs/tests/README.md

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

sys/contrib/openzfs/tests/runfiles/linux.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/bin/zts-report.py.in

sys/contrib/openzfs/tests/zfs-tests/cmd/libzfs_input_check/libzfs_input_check.c

sys/contrib/openzfs/tests/zfs-tests/cmd/nvlist_to_lua/nvlist_to_lua.c

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_diff/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_diff/socket.c

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_cliargs.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_diff/zfs_diff_mangle.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/Makefile.am

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/cleanup.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/pam_basic.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/pam_nounmount.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/pam_short_password.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/pam/utilities.kshlib

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h