diff options
| author | des <des@FreeBSD.org> | 2005-12-14 00:49:52 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-12-14 00:49:52 +0000 |
| commit | 5d3c44687b2e85f65228a2386d84f916ff779427 (patch) | |
| tree | edb405f1b2060efab8f9d986b17763a5aceffb7f /sys/kern/vfs_vnops.c | |
| parent | d40bda1cd272e7d30f8998f9f75273296ea1c654 (diff) | |
| download | FreeBSD-src-5d3c44687b2e85f65228a2386d84f916ff779427.zip FreeBSD-src-5d3c44687b2e85f65228a2386d84f916ff779427.tar.gz | |
Eradicate caddr_t from the VFS API.
Diffstat (limited to 'sys/kern/vfs_vnops.c')
| -rw-r--r-- | sys/kern/vfs_vnops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index d8c00fd..fda74f1 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -327,7 +327,7 @@ vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, active_cred, file_cred, aresid, td) enum uio_rw rw; struct vnode *vp; - caddr_t base; + void *base; int len; off_t offset; enum uio_seg segflg; @@ -420,7 +420,7 @@ vn_rdwr_inchunks(rw, vp, base, len, offset, segflg, ioflg, active_cred, file_cred, aresid, td) enum uio_rw rw; struct vnode *vp; - caddr_t base; + void *base; size_t len; off_t offset; enum uio_seg segflg; @@ -457,7 +457,7 @@ vn_rdwr_inchunks(rw, vp, base, len, offset, segflg, ioflg, active_cred, if (error) break; offset += chunk; - base += chunk; + base = (char *)base + chunk; uio_yield(); } while (len); if (aresid) @@ -844,7 +844,7 @@ vn_closefile(fp, td) lf.l_start = 0; lf.l_len = 0; lf.l_type = F_UNLCK; - (void) VOP_ADVLOCK(vp, (caddr_t)fp, F_UNLCK, &lf, F_FLOCK); + (void) VOP_ADVLOCK(vp, fp, F_UNLCK, &lf, F_FLOCK); } fp->f_ops = &badfileops; |
