diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-06-01 07:13:48 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2007-06-01 07:13:48 +0000 |
| commit | 68fd88eac1cb9c4f4521b54e76cd69871c606d50 (patch) | |
| tree | e6d5ca5c09d6cf406d5a74b3a5f7c2643cb0a830 /sys/nfs | |
| parent | 6fc98f2cf1fdc06c7992f7c24569e46bfddbd277 (diff) | |
daddr_t -> daddr64_t;
Basically the usage of daddr_t was to math out arguments to
nfs_getcacheblk, wich calls getblk();
ok deraadt@
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_bio.c | 10 | ||||
| -rw-r--r-- | sys/nfs/nfs_var.h | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 9137c5e7ab8..91c84d585eb 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.44 2006/11/29 12:24:18 miod Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.45 2007/06/01 07:13:47 thib Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -77,7 +77,7 @@ nfs_bioread(vp, uio, ioflag, cred) struct vattr vattr; struct proc *p; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - daddr_t lbn, bn, rabn; + daddr64_t lbn, bn, rabn; caddr_t baddr; int got_buf = 0, nra, error = 0, n = 0, on = 0, not_readin; off_t offdiff; @@ -227,7 +227,7 @@ again: break; case VLNK: nfsstats.biocache_readlinks++; - bp = nfs_getcacheblk(vp, (daddr_t)0, NFS_MAXPATHLEN, p); + bp = nfs_getcacheblk(vp, 0, NFS_MAXPATHLEN, p); if (!bp) return (EINTR); if ((bp->b_flags & B_DONE) == 0) { @@ -290,7 +290,7 @@ nfs_write(v) struct buf *bp; struct vattr vattr; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - daddr_t lbn, bn; + daddr64_t lbn, bn; int n, on, error = 0, extended = 0, wrotedta = 0, truncated = 0; #ifdef DIAGNOSTIC @@ -461,7 +461,7 @@ again: struct buf * nfs_getcacheblk(vp, bn, size, p) struct vnode *vp; - daddr_t bn; + daddr64_t bn; int size; struct proc *p; { diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h index 9680562d095..8c774ef2164 100644 --- a/sys/nfs/nfs_var.h +++ b/sys/nfs/nfs_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_var.h,v 1.26 2007/04/19 14:46:44 thib Exp $ */ +/* $OpenBSD: nfs_var.h,v 1.27 2007/06/01 07:13:47 thib Exp $ */ /* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */ /* @@ -63,7 +63,7 @@ union nethostaddr; /* nfs_bio.c */ int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *); int nfs_write(void *); -struct buf *nfs_getcacheblk(struct vnode *, daddr_t, int, struct proc *); +struct buf *nfs_getcacheblk(struct vnode *, daddr64_t, int, struct proc *); int nfs_vinvalbuf(struct vnode *, int, struct ucred *, struct proc *, int); int nfs_asyncio(struct buf *); diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 656d0f1fd5f..d5654e82b90 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.73 2007/03/18 15:05:33 mickey Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.74 2007/06/01 07:13:47 thib Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -2668,9 +2668,9 @@ nfs_bmap(v) { struct vop_bmap_args /* { struct vnode *a_vp; - daddr_t a_bn; + daddr64_t a_bn; struct vnode **a_vpp; - daddr_t *a_bnp; + daddr64_t *a_bnp; int *a_runp; } */ *ap = v; struct vnode *vp = ap->a_vp; |