Diffusion FreeBSD src repository b9c2c366db1b

zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13
b9c2c366db1b
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13

Notable upstream pull request merges:
#13976 3ad882658 Avoid calling rw_destroy() on uninitialized rwlock
#15243 11574a793 Add zfs_prepare_disk script for disk firmware install
#15331 e1bc32f71 Report ashift of L2ARC devices in zdb
#15675 12a031a3f spa: make read/write queues configurable
#15719 b4481996b spa: Fix FreeBSD sysctl handlers
#15719 8e5298f0a spa: Let spa_taskq_param_get()'s addition of a newline

be optional

#15769 dfece78a4 Add 'zpool status -e' flag to see unhealthy vdevs
#15847 d1ee3d611 LUA: Backport CVE-2020-24370's patch

Obtained from: OpenZFS
OpenZFS commit: fb6d532066f23458f768a97ae94b158c42cbe484
OpenZFS tag: zfs-2.1.15

Details

Provenance

mm	Authored on Mar 1 2024, 1:57 PM

Parents

rGb9880e247b26: sigsys test: correct count of delivered signals
rGfb6d532066f2: Tag zfs-2.1.15

Branches

Unknown

Tags

Unknown

Event Timeline

mm committed rGb9c2c366db1b: zfs: merge openzfs/zfs@fb6d53206 (zfs-2.1-release) into stable/13 (authored by mm).Mar 1 2024, 2:16 PM

Merged Changes

fb6d532066f2 Tag zfs-2.1.15
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
3ad882658512 Avoid calling rw_destroy() on uninitialized rwlock
Author
Jorgen Lundman <lundman@lundman.net>
Browse Repository
No Builds
No Audits
00a3821020c3 Fix GCC 12 compilation errors
Author
szubersk <szuberskidamian@gmail.com>
Browse Repository
No Builds
No Audits
85c6fd405859 libzfs_sendrecv: Style pass on send_print_verbose
Author
freqlabs
Browse Repository
No Builds
No Audits
34c8d4d4fd4f Linux 6.7 compat: META
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
07ce4ad6bf07 Linux 6.6 compat: META
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
2f21b169af36 ZTS: Debug zfs_share_concurrent_shares failure
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
e54eef24c622 tests: zfs_share_concurrent_shares: don't use log_musts in subprocesses
Author
наб <nabijaczleweli@nabijaczleweli.xyz>
Browse Repository
No Builds
No Audits
4a0d86afc3aa Fix the FreeBSD userspace build (#15716)
Author
markj
Browse Repository
No Builds
No Audits
57da499afdc9 [zfs-2.1.15] Update ABI files
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
f392c4073ac2 ZTS: Fix zfs_load-key failures on F39
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
d1ee3d611d84 LUA: Backport CVE-2020-24370's patch
Author
the-Chain-Warden-thresh <18302010006@fudan.edu.cn>
Browse Repository
No Builds
No Audits
dfece78a4286 Add 'zpool status -e' flag to see unhealthy vdevs
Author
Cameron Harr <charr@llnl.gov>
Browse Repository
No Builds
No Audits
0bc841fb5957 zpool: Add slot power control, print power status
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
6b33ae072cd2 zed: fix typo in variable ZED_POWER_OFF_ENCLO*US*RE_SLOT_ON_FAULT
Author
Mauricio Faria de Oliveira <mfo@canonical.com>
Browse Repository
No Builds
No Audits
53a55390fb18 ZTS: Add dirty dnode stress test
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
bc42a2fb54f1 ZTS: Fix 'could not unmount datasets' on Alma 9 (#15542)
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
dffe59c41519 zed: misc vdev_enc_sysfs_path fixes
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
11574a7934a5 Add zfs_prepare_disk script for disk firmware install
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
35252ae0fd5e Linux 6.8 compat: replace MAX_ORDER define
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
38f6f3ada107 Linux 6.8 compat: implement strlcpy fallback
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
327160424224 Linux 6.8 compat: update for new bdev access functions
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
0db66111d36a Linux 6.8 compat: make test functions static
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
71d407cc394d Linux 6.7 compat: zfs_setattr fix atime update
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
a9dc1166b6b9 Linux 6.5 compat: check BLK_OPEN_EXCL is defined
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
5f465d15151d linux 6.7 compat: rework shrinker setup for heap allocations
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
72bf91dfdb83 linux 6.7 compat: handle superblock shrinker member change
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
e5f191d76007 linux 6.7 compat: use inode atime/mtime accessors
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
da1cbd869b4e linux 6.7 compat: simplify current_time() check
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
4b849db210d1 Linux 6.6 compat: fix configure error with clang (#15558)
Author
Jaron Kent-Dobias <kentdobias@users.noreply.github.com>
Browse Repository
No Builds
No Audits
e68922faaa31 Linux 6.6 compat: fsync_bdev() has been removed in favor of sync_blockdev()
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
b8bf99cca91e Linux 6.6 compat: generic_fillattr has a new u32 request_mask added at arg2
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
73ab3bd088da Linux 6.6 compat: use inode_get/set_ctime*(...)
Author
Coleman Kane <ckane@colemankane.org>
Browse Repository
No Builds
No Audits
bb1dd98bccac Workaround UBSAN errors for variable arrays
Author
Tony Hutter <hutter2@llnl.gov>
Browse Repository
No Builds
No Audits
94a830adf689 FreeBSD: catch up to __FreeBSD_version 1400093
Author
mjg
Browse Repository
No Builds
No Audits
8e5298f0adaf spa: Let spa_taskq_param_get()'s addition of a newline be optional
Author
markj
Browse Repository
No Builds
No Audits
b4481996bdd0 spa: Fix FreeBSD sysctl handlers
Author
markj
Browse Repository
No Builds
No Audits
478c5b4f3f08 freebsd: fix compile for spa_taskq_read/spa_taskq_write params
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
f8f3cac084c5 [2.1] compat: add check for kernel_neon_* availability
Author
Keith Gable <keith@ziggythehamster.sh>
Browse Repository
No Builds
No Audits
12a031a3f50d spa: make read/write queues configurable
Author
rob.norris_klarasystems.com
Browse Repository
No Builds
No Audits
9e41d5d05c2d libshare: nfs: pass through ipv6 addresses in bracket notation
Author
felixdoerre <felixdoerre@users.noreply.github.com>
Browse Repository
No Builds
No Audits
ae75a78ba3f4 ZTS: Disable io_uring test on CentOS 9
Author
Brian Behlendorf <behlendorf1@llnl.gov>
Browse Repository
No Builds
No Audits
e1bc32f71035 Report ashift of L2ARC devices in zdb
Author
g_amanakis_yahoo.com
Browse Repository
No Builds
No Audits
74da5eb46881 zfs-dkms: fix shell-init error message
Author
AllKind <allkind@fastest.cc>
Browse Repository
No Builds
No Audits
d96360b7f2e0 Fix dkms installation of deb packages created with Alien.
Author
AllKind <allkind@fastest.cc>
Browse Repository
No Builds
No Audits

Changes (143)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

cddl/

lib/

libzfs/

usr.libexec/

zfs_prepare_disk

sys/

contrib/

openzfs/

cmd/

zdb/

zed/

agents/

zed.d/

statechange-slot_off.sh

zfs/

zpool/

os/

freebsd/

zpool_vdev_os.c

linux/

zpool_vdev_os.c

zpool.d/

config/

always-compiler-options.m4

kernel-automount.m4

kernel-blkdev.m4

kernel-block-device-operations.m4

kernel-commit-metadata.m4

kernel-current-time.m4

kernel-dentry-operations.m4

kernel-dirty-inode.m4

kernel-encode-fh-inode.m4

kernel-evict-inode.m4

kernel-fallocate.m4

kernel-fsync-bdev.m4

kernel-fsync.m4

kernel-generic_fillattr.m4

kernel-get-link.m4

kernel-inode-create.m4

kernel-inode-getattr.m4

kernel-inode-lookup.m4

kernel-inode-setattr.m4

kernel-inode-times.m4

kernel-make-request-fn.m4

kernel-mkdir.m4

kernel-mknod.m4

kernel-proc-operations.m4

kernel-put-link.m4

kernel-rename.m4

kernel-show-options.m4

kernel-shrink.m4

kernel-strlcpy.m4

kernel-symlink.m4

kernel-timer.m4

kernel-tmpfile.m4

kernel-vfs-direct_IO.m4

kernel-vfs-iterate.m4

kernel-vfs-rw-iterate.m4

kernel-writepage_t.m4

kernel-xattr-handler.m4

include/

os/

freebsd/

spl/

sys/

linux/

kernel/

linux/

spl/

sys/

zfs/

sys/

sys/

vdev_raidz_impl.h

lib/

libnvpair/

libshare/

os/

linux/

libuutil/

libzfs/

libzfs_sendrecv.c

libzfs_core/

libzfs_core.abi

libzfsbootenv/

libzfsbootenv.abi

libzutil/

os/

freebsd/

zutil_import_os.c

linux/

zutil_import_os.c

man/

man4/

man8/

zfs_prepare_disk.8.in

zpool-offline.8

module/

icp/

lua/

os/

linux/

spl/

spl-kmem-cache.c

zfs/

zfs/

rpm/

generic/

zfs-dkms.spec.in

scripts/

zfs_prepare_disk

tests/

runfiles/

zfs-tests/

include/

tests/

functional/

cli_root/

zfs_load-key/

zfs_load-key_common.kshlib

zfs_share/

zfs_share_007_neg.ksh

zfs_share_013_pos.ksh

zfs_share_concurrent_shares.ksh

zpool_status/

zpool_status_002_pos.ksh

zpool_status_008_pos.ksh

cp_files/

ctime/

io/

modules/

zfs/

rGb9c2c366db1b

cddl/lib/libzfs/Makefile

cddl/usr.libexec/Makefile

cddl/usr.libexec/zfs_prepare_disk/Makefile

sys/contrib/openzfs/META

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

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

sys/contrib/openzfs/cmd/zed/zed.d/statechange-slot_off.sh

sys/contrib/openzfs/cmd/zed/zed.d/zed.rc

sys/contrib/openzfs/cmd/zed/zed_event.c

sys/contrib/openzfs/cmd/zfs/zfs_main.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.d/ses

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/config/Rules.am

sys/contrib/openzfs/config/always-compiler-options.m4

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

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

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

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

sys/contrib/openzfs/config/kernel-block-device-operations.m4

sys/contrib/openzfs/config/kernel-commit-metadata.m4

sys/contrib/openzfs/config/kernel-current-time.m4

sys/contrib/openzfs/config/kernel-dentry-operations.m4

sys/contrib/openzfs/config/kernel-dirty-inode.m4

sys/contrib/openzfs/config/kernel-encode-fh-inode.m4

sys/contrib/openzfs/config/kernel-evict-inode.m4

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

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

sys/contrib/openzfs/config/kernel-fsync-bdev.m4

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

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

sys/contrib/openzfs/config/kernel-get-link.m4

sys/contrib/openzfs/config/kernel-inode-create.m4

sys/contrib/openzfs/config/kernel-inode-getattr.m4

sys/contrib/openzfs/config/kernel-inode-lookup.m4

sys/contrib/openzfs/config/kernel-inode-setattr.m4

sys/contrib/openzfs/config/kernel-inode-times.m4

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

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

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

sys/contrib/openzfs/config/kernel-proc-operations.m4

sys/contrib/openzfs/config/kernel-put-link.m4

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

sys/contrib/openzfs/config/kernel-show-options.m4

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

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

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

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

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

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

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

sys/contrib/openzfs/config/kernel-vfs-rw-iterate.m4

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

sys/contrib/openzfs/config/kernel-xattr-handler.m4

sys/contrib/openzfs/config/kernel.m4

sys/contrib/openzfs/config/zfs-build.m4

sys/contrib/openzfs/include/libzfs.h

sys/contrib/openzfs/include/libzutil.h

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

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

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

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

sys/contrib/openzfs/include/os/linux/spl/sys/Makefile.am

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

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

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

sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_vnops_os.h

sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h

sys/contrib/openzfs/include/sys/vdev_raidz_impl.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/libshare/os/linux/nfs.c

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

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

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

sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.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/libzutil/os/freebsd/zutil_import_os.c

sys/contrib/openzfs/lib/libzutil/os/linux/zutil_import_os.c

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

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

sys/contrib/openzfs/man/Makefile.am

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

sys/contrib/openzfs/man/man8/.gitignore

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

sys/contrib/openzfs/man/man8/zfs_prepare_disk.8.in

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

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

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

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

sys/contrib/openzfs/module/icp/Makefile.in

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

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

sys/contrib/openzfs/module/os/linux/spl/Makefile.in

sys/contrib/openzfs/module/os/linux/spl/spl-kmem-cache.c

sys/contrib/openzfs/module/os/linux/spl/spl-kstat.c

sys/contrib/openzfs/module/os/linux/spl/spl-shrinker.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/arc_os.c

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

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

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

sys/contrib/openzfs/module/os/linux/zfs/zfs_vnops_os.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_ctldir.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/zfs/Makefile.in

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

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

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

sys/contrib/openzfs/scripts/Makefile.am

sys/contrib/openzfs/scripts/zfs_prepare_disk

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

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

sys/contrib/openzfs/tests/zfs-tests/include/libtest.shlib

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_load-key/zfs_load-key_common.kshlib

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_007_neg.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_013_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_concurrent_shares.ksh

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_002_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_status/zpool_status_008_pos.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/.gitignore

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

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/cp_stress.ksh

sys/contrib/openzfs/tests/zfs-tests/tests/functional/cp_files/seekflood.c

sys/contrib/openzfs/tests/zfs-tests/tests/functional/ctime/ctime.c

sys/contrib/openzfs/tests/zfs-tests/tests/functional/io/io_uring.ksh

sys/modules/zfs/zfs_config.h

sys/modules/zfs/zfs_gitrev.h