HomeFreeBSD
Diffusion FreeBSD src repository d4b496996750

zfs: merge openzfs/zfs@3de7aeb68 (zfs-2.1-release) into stable/13
d4b496996750
Actions

Description

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

Notable upstream pull request merges:

#12054 Avoid deadlock when removing L2ARC devices under I/O
#12221 vdev_draid_min_asize() ignores reserved space

Obtained from: OpenZFS
OpenZFS commit: 3de7aeb68ac1cc1fedd99506671d9028ad1a3c20

Details

Provenance
mmAuthored on Jun 20 2021, 1:16 PM
Parents
rG09274116f4d9: tests: Revise FIB lookups per second benchmarking routines
rG3de7aeb68ac1: Avoid deadlock when removing L2ARC devices under I/O
Branches
Unknown
Tags
Unknown

Merged Changes

Changes (11)

PathSize
sys/
contrib/
openzfs/
etc/
systemd/
system/
module/
os/
linux/
zfs/
zfs/
rpm/
generic/
tests/
zfs-tests/
tests/
functional/
cli_root/
zfs_destroy/
modules/
zfs/

rGd4b496996750

View Options

sys/contrib/openzfs/etc/systemd/system/zfs-import-cache.service.in

Loading...
View Options

sys/contrib/openzfs/etc/systemd/system/zfs-import-scan.service.in

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

sys/modules/zfs/zfs_config.h

Loading...