diff options
author | Martin Matuska <mm@FreeBSD.org> | 2023-11-09 10:42:33 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2023-11-09 12:19:17 +0000 |
commit | e716630d4cf89e69ec3f675ebfceee09f1a85e05 (patch) | |
tree | 3ee825a5671f470e1481d24312b58895a12d01ac /cddl | |
parent | f5b3e686292b6502878c64c3c154908024e06eb6 (diff) | |
parent | 887a3c533b94a4b70075e310f15c45b9dee19410 (diff) | |
download | src-e716630d4cf89e69ec3f675ebfceee09f1a85e05.tar.gz src-e716630d4cf89e69ec3f675ebfceee09f1a85e05.zip |
zfs: merge openzfs/zfs@887a3c533
Notable upstream pull request merges:
#15022 5caeef02f RAID-Z expansion feature
#15457 887a3c533 Increase L2ARC write rate and headroom
#15504 1c1be60fa Unbreak FreeBSD world build after 3bd4df384
Obtained from: OpenZFS
OpenZFS commit: 887a3c533b94a4b70075e310f15c45b9dee19410
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/lib/libzpool/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index d05babdc26e0..c801cf571e88 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -142,6 +142,7 @@ KERNEL_C = \ vdev_indirect_mapping.c \ vdev_initialize.c \ vdev_label.c \ + vdev_label_os.c \ vdev_mirror.c \ vdev_missing.c \ vdev_queue.c \ |