summaryrefslogtreecommitdiff
path: root/sys/ufs/ext2fs/ext2fs_readwrite.c
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2013-09-14 02:28:04 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2013-09-14 02:28:04 +0000
commit8980b4bc0e0964f3f84625f36ff46df354ec85f2 (patch)
treee829db0fb28d09e3ad2095b685326a8a8732b65c /sys/ufs/ext2fs/ext2fs_readwrite.c
parent7b115ba51011af0745a43200d86691551c932fd6 (diff)
Correct the handling of I/O of >=2^32 bytes and the ktracing there of
by using size_t/ssize_t instead of int/u_int to handle I/O lengths in uiomove(), vn_fsizechk(), and ktrgenio(). Eliminate the always-zero 'error' argument to ktrgenio() at the same time.
Diffstat (limited to 'sys/ufs/ext2fs/ext2fs_readwrite.c')
-rw-r--r--sys/ufs/ext2fs/ext2fs_readwrite.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index fe05a011116..60d1dea1509 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.25 2013/06/11 16:42:18 deraadt Exp $ */
+/* $OpenBSD: ext2fs_readwrite.c,v 1.26 2013/09/14 02:28:03 guenther Exp $ */
/* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */
/*-
@@ -164,7 +164,8 @@ ext2fs_write(void *v)
struct buf *bp;
int32_t lbn;
off_t osize;
- int blkoffset, error, flags, ioflag, resid, size, xfersize, overrun;
+ int blkoffset, error, flags, ioflag, size, xfersize;
+ ssize_t resid, overrun;
ioflag = ap->a_ioflag;
uio = ap->a_uio;