diff options
| author | kib <kib@FreeBSD.org> | 2009-06-25 18:46:30 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2009-06-25 18:46:30 +0000 |
| commit | a7a5954511a4b948ae8218744bc2069641a3ab19 (patch) | |
| tree | 78b4ad05c311866c8b27041ac4ed99ffd980653d /sys/fs | |
| parent | eb2a6cf16eda6c60423ca640ec4c2a4e7a04373e (diff) | |
| download | FreeBSD-src-a7a5954511a4b948ae8218744bc2069641a3ab19.zip FreeBSD-src-a7a5954511a4b948ae8218744bc2069641a3ab19.tar.gz | |
Change the type of uio_resid member of struct uio from int to ssize_t.
Note that this does not actually enable full-range i/o requests for
64 architectures, and is done now to update KBI only.
Tested by: pho
Reviewed by: jhb, bde (as part of the review of the bigger patch)
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/coda/coda_psdev.c | 2 | ||||
| -rw-r--r-- | sys/fs/coda/coda_vnops.c | 4 | ||||
| -rw-r--r-- | sys/fs/pseudofs/pseudofs_vnops.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index b55a5f4..494f30b 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -331,7 +331,7 @@ vc_write(struct cdev *dev, struct uio *uiop, int flag) * Get the rest of the data. */ if (vmp->vm_outSize < uiop->uio_resid) { - myprintf(("vcwrite: more data than asked for (%d < %d)\n", + myprintf(("vcwrite: more data than asked for (%d < %zd)\n", vmp->vm_outSize, uiop->uio_resid)); /* diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index c5c6cb1..edaba65 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -331,7 +331,7 @@ coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag, int error = 0; MARK_ENTRY(CODA_RDWR_STATS); - CODADEBUG(CODA_RDWR, myprintf(("coda_rdwr(%d, %p, %d, %lld, %d)\n", + CODADEBUG(CODA_RDWR, myprintf(("coda_rdwr(%d, %p, %zd, %lld, %d)\n", rw, (void *)uiop->uio_iov->iov_base, uiop->uio_resid, (long long)uiop->uio_offset, uiop->uio_segflg));); @@ -1470,7 +1470,7 @@ coda_readdir(struct vop_readdir_args *ap) int opened_internally = 0; MARK_ENTRY(CODA_READDIR_STATS); - CODADEBUG(CODA_READDIR, myprintf(("coda_readdir(%p, %d, %lld, %d)\n", + CODADEBUG(CODA_READDIR, myprintf(("coda_readdir(%p, %zd, %lld, %d)\n", (void *)uiop->uio_iov->iov_base, uiop->uio_resid, (long long)uiop->uio_offset, uiop->uio_segflg));); diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 8421d17..e03749b 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -622,9 +622,9 @@ pfs_read(struct vop_read_args *va) VOP_UNLOCK(vn, 0); if (pn->pn_flags & PFS_RAWRD) { - PFS_TRACE(("%lu resid", (unsigned long)uio->uio_resid)); + PFS_TRACE(("%zd resid", uio->uio_resid)); error = pn_fill(curthread, proc, pn, NULL, uio); - PFS_TRACE(("%lu resid", (unsigned long)uio->uio_resid)); + PFS_TRACE(("%zd resid", uio->uio_resid)); goto ret; } |
