diff options
| -rw-r--r-- | sys/tmpfs/tmpfs_subr.c | 10 | ||||
| -rw-r--r-- | sys/tmpfs/tmpfs_vnops.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/tmpfs/tmpfs_subr.c b/sys/tmpfs/tmpfs_subr.c index ce21637c541..bcbad5ed2b6 100644 --- a/sys/tmpfs/tmpfs_subr.c +++ b/sys/tmpfs/tmpfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_subr.c,v 1.14 2015/04/17 04:43:21 guenther Exp $ */ +/* $OpenBSD: tmpfs_subr.c,v 1.15 2016/02/06 16:10:23 stefan Exp $ */ /* $NetBSD: tmpfs_subr.c,v 1.79 2012/03/13 18:40:50 elad Exp $ */ /* @@ -740,7 +740,7 @@ tmpfs_dir_getdotents(tmpfs_node_t *node, struct dirent *dp, struct uio *uio) return EJUSTRETURN; } - if ((error = uiomovei(dp, dp->d_reclen, uio)) != 0) { + if ((error = uiomove(dp, dp->d_reclen, uio)) != 0) { return error; } @@ -837,7 +837,7 @@ tmpfs_dir_getdents(tmpfs_node_t *node, struct uio *uio) } /* Copy out the directory entry and continue. */ - error = uiomovei(&dent, dent.d_reclen, uio); + error = uiomove(&dent, dent.d_reclen, uio); if (error) { break; } @@ -1225,7 +1225,7 @@ tmpfs_uiomove(tmpfs_node_t *node, struct uio *uio, vsize_t len) if (pgoff + len < PAGE_SIZE) { va = tmpfs_uio_lookup(node, pgnum); if (va != (vaddr_t)NULL) - return uiomovei((void *)va + pgoff, len, uio); + return uiomove((void *)va + pgoff, len, uio); } if (len >= TMPFS_UIO_MAXBYTES) { @@ -1249,7 +1249,7 @@ tmpfs_uiomove(tmpfs_node_t *node, struct uio *uio, vsize_t len) return error; } - error = uiomovei((void *)va + pgoff, sz, uio); + error = uiomove((void *)va + pgoff, sz, uio); if (error == 0 && pgoff + sz < PAGE_SIZE) tmpfs_uio_cache(node, pgnum, va); else diff --git a/sys/tmpfs/tmpfs_vnops.c b/sys/tmpfs/tmpfs_vnops.c index e3a4178fc07..404c8e4554b 100644 --- a/sys/tmpfs/tmpfs_vnops.c +++ b/sys/tmpfs/tmpfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_vnops.c,v 1.23 2015/12/08 15:26:25 tedu Exp $ */ +/* $OpenBSD: tmpfs_vnops.c,v 1.24 2016/02/06 16:10:23 stefan Exp $ */ /* $NetBSD: tmpfs_vnops.c,v 1.100 2012/11/05 17:27:39 dholland Exp $ */ /* @@ -1017,8 +1017,8 @@ tmpfs_readlink(void *v) KASSERT(vp->v_type == VLNK); node = VP_TO_TMPFS_NODE(vp); - error = uiomovei(node->tn_spec.tn_lnk.tn_link, - MIN(node->tn_size, uio->uio_resid), uio); + error = uiomove(node->tn_spec.tn_lnk.tn_link, + MIN((size_t)node->tn_size, uio->uio_resid), uio); tmpfs_update(node, TMPFS_NODE_ACCESSED); return error; |