diff options
author | Martin Matuska <mm@FreeBSD.org> | 2023-08-26 21:20:04 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2023-08-26 21:51:42 +0000 |
commit | 315ee00fa9616b0a192b6834911f98bcf5316a6b (patch) | |
tree | e0f347bd49fd2e6826d3677057ed3206cc45dc7c /cddl | |
parent | b3a714652ff00f83b2072caaa1fd8b9699c93789 (diff) | |
parent | 804414aad224b432590afe3f9ec114ffb49e0f13 (diff) | |
download | src-315ee00fa9616b0a192b6834911f98bcf5316a6b.tar.gz src-315ee00fa9616b0a192b6834911f98bcf5316a6b.zip |
zfs: merge openzfs/zfs@804414aad
Notable upstream pull request merges:
#15024 Add missed DMU_PROJECTUSED_OBJECT prefetch
#15029 Do not request data L1 buffers on scan prefetch
#15036 FreeBSD: catch up to __FreeBSD_version 1400093
#15039 Fix raw receive with different indirect block size
#15047 FreeBSD: Fix build on stable/13 after 1302506
#15049 Fix the ZFS checksum error histograms with larger record sizes
#15052 Reduce bloat in ereport.fs.zfs.checksum events
#15056 Avoid extra snprintf() in dsl_deadlist_merge()
#15061 Ignore pool ashift property during vdev attachment
#15063 Don't panic if setting vdev properties is unsupported for this vdev type
#15067 spa_min_alloc should be GCD, not min
#15071 Add explicit prefetches to bpobj_iterate()
#15072 Adjust prefetch parameters
#15076 Refactor dmu_prefetch()
#15079 set autotrim default to 'off' everywhere
#15080 ZIL: Fix config lock deadlock
#15088 metaslab: tuneable to better control force ganging
#15096 Avoid waiting in dmu_sync_late_arrival()
#15097 BRT should return EOPNOTSUPP
#15103 Remove zl_issuer_lock from zil_suspend()
#15107 Remove fastwrite mechanism
#15113 libzfs: sendrecv: send_progress_thread: handle SIGINFO/SIGUSR1
#15122 ZIL: Second attempt to reduce scope of zl_issuer_lock
#15129 zpool_vdev_remove() should handle EALREADY error return
#15132 ZIL: Replay blocks without next block pointer
#15148 zfs_clone_range should return descriptive error codes
#15153 ZIL: Avoid dbuf_read() before dmu_sync()
#15172 copy_file_range: fix fallback when source create on same txg
#15180 Update outdated assertion from zio_write_compress
Obtained from: OpenZFS
OpenZFS commit: 804414aad224b432590afe3f9ec114ffb49e0f13
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/lib/libzfs/Makefile | 1 | ||||
-rw-r--r-- | cddl/lib/libzfs/Makefile.depend | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index f96ba4f24e5d..6f8965e4c14a 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -19,6 +19,7 @@ LIBADD= \ md \ nvpair \ pthread \ + rt \ umem \ util \ uutil \ diff --git a/cddl/lib/libzfs/Makefile.depend b/cddl/lib/libzfs/Makefile.depend index 60fad1090483..1fead4b4f29d 100644 --- a/cddl/lib/libzfs/Makefile.depend +++ b/cddl/lib/libzfs/Makefile.depend @@ -15,6 +15,7 @@ DIRDEPS = \ lib/libexpat \ lib/libgeom \ lib/libmd \ + lib/librt \ lib/libthr \ lib/libutil \ lib/libz \ |