diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2025-11-18 12:44:03 +0100 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2025-11-19 13:36:55 -0800 |
| commit | 7b5b0f43eb061f3af5c862ce8dc38d1be44fc287 (patch) | |
| tree | 5c29cad3a54ed51e75c9f9610dc4bdf0f631b01c /sys/contrib/openzfs/module/zfs/space_map.c | |
| parent | d02a08f899322dd9ed34cbf77e917068ba59b3ff (diff) | |
zfs: merge openzfs/zfs@099f69ff5 (zfs-2.4-release) into stable/15
OpenZFS 2.4.0 rc4
Notable upstream pull request merges:
#17477 1e8c96d7d Add knob to disable slow io notifications
#17792 5582e8b08 Update dnode_next_offset_level to accept blkid
instead of offset
#17872 584762617 Pass flags to more DMU write/hold functions
#17875 178a8be21 BRT: Round bv_entcount up to BRT_BLOCKSIZE
#17875 e3acd0a72 Fix caching of DDT log and BRT
#17877 67fc49433 Cleanup ZIO_FLAG_IO_RETRY vs TRYHARD usage
#17824 dda711dbb Fix gang write late_arrival bug
#17890 41878d57e Add BRT support to zpool prefetch command
#17903 aaf374bd4 ZIO: Set minimum number of free issue threads to 32
#17906 ac0bc4cc0 spa_misc: add an API for spa_namespace_lock
#17908 583db4003 FreeBSD: Add support for _PC_CASE_INSENSITIVE
#17911 -multiple Update library ABI versions for v2.4.0
#17915 e305c7d59 BRT: Fix ranges to blocks conversion math
#17916 002bc3da6 BRT: Increase block size from 4KB to 8KB
#17921 e895c7619 ZAP: Remove dmu_object_info_from_dnode() call
Approved by: re (cperciva)
Obtained from: OpenZFS
OpenZFS commit: 099f69ff5d3df7988632039db7ad6d183eb34042
OpenZFS tag: zfs-2.4.0-rc4
(cherry picked from commit 155d5b8a19baa864ebe9d8346d932bd04ea23aca)
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/space_map.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/space_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/zfs/space_map.c b/sys/contrib/openzfs/module/zfs/space_map.c index 5f24963f2291..f20c49ebb6de 100644 --- a/sys/contrib/openzfs/module/zfs/space_map.c +++ b/sys/contrib/openzfs/module/zfs/space_map.c @@ -537,7 +537,7 @@ space_map_write_intro_debug(space_map_t *sm, maptype_t maptype, dmu_tx_t *tx) SM_DEBUG_TXG_ENCODE(dmu_tx_get_txg(tx)); dmu_write(sm->sm_os, space_map_object(sm), sm->sm_phys->smp_length, - sizeof (dentry), &dentry, tx); + sizeof (dentry), &dentry, tx, DMU_READ_NO_PREFETCH); sm->sm_phys->smp_length += sizeof (dentry); } |
