diff options
Diffstat (limited to 'sys/nfs')
-rw-r--r-- | sys/nfs/nfs_bio.c | 6 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_vnops.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 0b17b91972d..458e0d17c30 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.78 2014/12/18 20:59:21 tedu Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.79 2015/02/10 21:56:10 miod Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -224,7 +224,7 @@ again: if (n > 0) { if (!baddr) baddr = bp->b_data; - error = uiomove(baddr + on, (int)n, uio); + error = uiomovei(baddr + on, (int)n, uio); } if (vp->v_type == VLNK) @@ -350,7 +350,7 @@ again: goto again; } - error = uiomove((char *)bp->b_data + on, n, uio); + error = uiomovei((char *)bp->b_data + on, n, uio); if (error) { bp->b_flags |= B_ERROR; brelse(bp); diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index ddcd98b253e..447c7e8f5ae 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.124 2015/01/17 17:49:27 deraadt Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.125 2015/02/10 21:56:10 miod Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -714,7 +714,7 @@ nfsm_uiotombuf(struct mbuf **mp, struct uio *uiop, size_t len) while (len) { xfer = min(len, M_TRAILINGSPACE(mb)); - uiomove(mb_offset(mb), xfer, uiop); + uiomovei(mb_offset(mb), xfer, uiop); mb->m_len += xfer; len -= xfer; if (len > 0) { diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 9d66be0c56d..a16dca17d85 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.160 2014/12/29 05:29:28 miod Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.161 2015/02/10 21:56:10 miod Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -2030,7 +2030,7 @@ nfs_readdir(void *v) break; } - if ((error = uiomove(dp, dp->d_reclen, uio))) + if ((error = uiomovei(dp, dp->d_reclen, uio))) break; newoff = fxdr_hyper(&ndp->cookie[0]); |