diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2023-06-10 17:31:17 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2023-06-10 17:31:17 +0000 |
| commit | 4e8d558c9d1cf3e7e424e3fb123b01979c3d57f2 (patch) | |
| tree | 388dae3e7b19c85bee82d45c511404a8c46034cd /cddl | |
| parent | 5ca7f02946940ff698741d4da4a30b554cb0f592 (diff) | |
| parent | feff9dfed3df1bbae5dd74959a6ad87d11f27ffb (diff) | |
| download | src-4e8d558c9d1cf3e7e424e3fb123b01979c3d57f2.tar.gz src-4e8d558c9d1cf3e7e424e3fb123b01979c3d57f2.zip | |
zfs: merge openzfs/zfs@feff9dfed
Notable upstream pull request merges:
#14833 Update compatibility.d files
#14841 ZIL: Reduce scope of per-dataset zl_issuer_lock
#14863 zil: Add some more statistics
#14866 btree: Implement faster binary search algorithm
#14894 Fix inconsistent definition of zfs_scrub_error_blocks_per_txg
#14892 Fix concurrent resilvers initiated at same time
#14903 Fix NULL pointer dereference when doing concurrent 'send' operations
#14910 ZIL: Allow to replay blocks of any size
#14939 Fix the L2ARC write size calculating logic
#14934 Introduce zfs_refcount_(add|remove)_few()
#14946 Improve l2arc reporting in arc_summary
#14953 Finally drop long disabled vdev cache
#14954 Fix the L2ARC write size calculating logic (2)
#14955 Use list_remove_head() where possible
#14959 ZIL: Fix race introduced by f63811f0721
Obtained from: OpenZFS
OpenZFS commit: feff9dfed3df1bbae5dd74959a6ad87d11f27ffb
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 5dbeb9cb1721..217159611e97 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -135,7 +135,6 @@ KERNEL_C = \ uberblock.c \ unique.c \ vdev.c \ - vdev_cache.c \ vdev_draid.c \ vdev_draid_rand.c \ vdev_file.c \ |