diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-07-07 21:31:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-07-07 21:31:52 +0000 |
| commit | 7cd22ac43418da08448d0bab1009ff3cbda85120 (patch) | |
| tree | 4f4d022512de4ea10d4556db0ff179970576c21b /sys/contrib/openzfs/module/zfs/abd.c | |
| parent | f68e3ea831b76a8927eed7f7abfea55ee5a193c4 (diff) | |
| parent | bdd11cbb90a2afa54fd00935ac0d34b4ddf2515c (diff) | |
| download | src-7cd22ac43418da08448d0bab1009ff3cbda85120.tar.gz src-7cd22ac43418da08448d0bab1009ff3cbda85120.zip | |
zfs: merge openzfs/zfs@bdd11cbb9 (master) into main
Notable upstream pull request merges:
#12274 Optimize txg_kick() process
#12281 Move gethrtime() calls out of vdev queue lock
#12287 Remove refcount from spa_config_*(
#12289 Compact dbuf/buf hashes and lock arrays
#12290 Remove avl_size field from struct avl_tree
#12294 Upstream: dmu_zfetch_stream_fini leaks refcount
#12295 Fix abd leak, kmem_free correct size of abd_t
#12328 FreeBSD: Hardcode abd_chunk_size to PAGE_SIZE
Obtained from: OpenZFS
OpenZFS commit: bdd11cbb90a2afa54fd00935ac0d34b4ddf2515c
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/abd.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/abd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/zfs/abd.c b/sys/contrib/openzfs/module/zfs/abd.c index d5fafccd08af..cc2d3575db63 100644 --- a/sys/contrib/openzfs/module/zfs/abd.c +++ b/sys/contrib/openzfs/module/zfs/abd.c @@ -531,7 +531,7 @@ abd_get_offset_impl(abd_t *abd, abd_t *sabd, size_t off, size_t size) } ASSERT3U(left, ==, 0); } else { - abd = abd_get_offset_scatter(abd, sabd, off); + abd = abd_get_offset_scatter(abd, sabd, off, size); } ASSERT3P(abd, !=, NULL); |