diff options
| author | Stefan Kempf <stefan@cvs.openbsd.org> | 2016-02-16 17:56:13 +0000 |
|---|---|---|
| committer | Stefan Kempf <stefan@cvs.openbsd.org> | 2016-02-16 17:56:13 +0000 |
| commit | 030d621b49092c2ddffe5effcf45c9738a13cac1 (patch) | |
| tree | 8bfc2b39d0425cd2b4781d3f7c2b8f083f680836 /sys/ufs/ext2fs/ext2fs_readwrite.c | |
| parent | d6456e0471e0bed6a73bedca23bb40ba014c5762 (diff) | |
Convert to uiomove. From Martin Natano.
Diffstat (limited to 'sys/ufs/ext2fs/ext2fs_readwrite.c')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_readwrite.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c index 04c8ffdb780..33cbcef0d1f 100644 --- a/sys/ufs/ext2fs/ext2fs_readwrite.c +++ b/sys/ufs/ext2fs/ext2fs_readwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_readwrite.c,v 1.36 2016/01/12 11:44:21 mpi Exp $ */ +/* $OpenBSD: ext2fs_readwrite.c,v 1.37 2016/02/16 17:56:12 stefan Exp $ */ /* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */ /*- @@ -87,7 +87,7 @@ ext2_ind_read(struct vnode *vp, struct inode *ip, struct m_ext2fs *fs, struct buf *bp; daddr_t lbn, nextlbn; off_t bytesinfile; - long size, xfersize, blkoffset; + int size, xfersize, blkoffset; int error; #ifdef DIAGNOSTIC @@ -145,7 +145,7 @@ ext2_ind_read(struct vnode *vp, struct inode *ip, struct m_ext2fs *fs, break; xfersize = size; } - error = uiomovei((char *)bp->b_data + blkoffset, xfersize, uio); + error = uiomove((char *)bp->b_data + blkoffset, xfersize, uio); if (error) break; brelse(bp); @@ -168,7 +168,7 @@ ext4_ext_read(struct vnode *vp, struct inode *ip, struct m_ext2fs *fs, struct ui size_t orig_resid; daddr_t lbn, pos; off_t bytesinfile; - long size, xfersize, blkoffset; + int size, xfersize, blkoffset; int error, cache_type; memset(&path, 0, sizeof path); @@ -225,7 +225,7 @@ ext4_ext_read(struct vnode *vp, struct inode *ip, struct m_ext2fs *fs, struct ui } xfersize = size; } - error = uiomovei(bp->b_data + blkoffset, xfersize, uio); + error = uiomove(bp->b_data + blkoffset, xfersize, uio); brelse(bp); if (error) return (error); @@ -248,7 +248,8 @@ ext2fs_write(void *v) int32_t lbn; off_t osize; int blkoffset, error, flags, ioflag, size, xfersize; - ssize_t resid, overrun; + size_t resid; + ssize_t overrun; ioflag = ap->a_ioflag; uio = ap->a_uio; @@ -324,8 +325,7 @@ ext2fs_write(void *v) if (size < xfersize) xfersize = size; - error = - uiomovei((char *)bp->b_data + blkoffset, (int)xfersize, uio); + error = uiomove((char *)bp->b_data + blkoffset, xfersize, uio); #if 0 if (ioflag & IO_NOCACHE) bp->b_flags |= B_NOCACHE; |