aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/zfs/sa.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-02-16 00:39:34 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-02-16 01:46:28 +0000
commit184c1b943937986c81e1996d999d21626ec7a4ff (patch)
treef7321df93d0bd5ffb8cf9245c84745dac7e81ce1 /sys/contrib/openzfs/module/zfs/sa.c
parent10fc4c3218381fef7189a5b8d46a757cd1989dff (diff)
parent83dd4a9252fd2044038a399d7afc68259d483b8e (diff)
downloadsrc-184c1b943937986c81e1996d999d21626ec7a4ff.tar.gz
src-184c1b943937986c81e1996d999d21626ec7a4ff.zip
zfs: merge OpenZFS master-436ab35a5
- speed up writing to ZFS pools without ZIL devices (aa755b3) - speed up importing ZFS pools (2d8f72d, a0e0199, cf0977a) ... MFC after: 2 weeks Reviewed by: mjg (partial) Tested by: pho Differential Revision: https://reviews.freebsd.org/D28677
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/sa.c')
-rw-r--r--sys/contrib/openzfs/module/zfs/sa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/openzfs/module/zfs/sa.c b/sys/contrib/openzfs/module/zfs/sa.c
index 83a10e7b4548..5af0aaa7d0aa 100644
--- a/sys/contrib/openzfs/module/zfs/sa.c
+++ b/sys/contrib/openzfs/module/zfs/sa.c
@@ -1502,7 +1502,7 @@ sa_lookup(sa_handle_t *hdl, sa_attr_type_t attr, void *buf, uint32_t buflen)
#ifdef _KERNEL
int
-sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio)
+sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, zfs_uio_t *uio)
{
int error;
sa_bulk_attr_t bulk;
@@ -1515,8 +1515,8 @@ sa_lookup_uio(sa_handle_t *hdl, sa_attr_type_t attr, uio_t *uio)
mutex_enter(&hdl->sa_lock);
if ((error = sa_attr_op(hdl, &bulk, 1, SA_LOOKUP, NULL)) == 0) {
- error = uiomove((void *)bulk.sa_addr, MIN(bulk.sa_size,
- uio_resid(uio)), UIO_READ, uio);
+ error = zfs_uiomove((void *)bulk.sa_addr, MIN(bulk.sa_size,
+ zfs_uio_resid(uio)), UIO_READ, uio);
}
mutex_exit(&hdl->sa_lock);
return (error);