diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
| commit | 6b46236c83f9aa5b9cd59b466eeba348ee23825a (patch) | |
| tree | ef7eca8601ed03d00b5a9a53b3355f66ed478486 /sys/nfs | |
| parent | cc20036a151815396b8c4285e8b3b56f0172f1d5 (diff) | |
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_bio.c | 8 | ||||
| -rw-r--r-- | sys/nfs/nfs_var.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 5c9b44b75d6..3cef0c68153 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.73 2012/07/11 12:39:20 guenther Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.74 2013/06/11 16:42:17 deraadt Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -75,7 +75,7 @@ nfs_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) struct vattr vattr; struct proc *p; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - daddr64_t lbn, bn, rabn; + daddr_t lbn, bn, rabn; caddr_t baddr; int got_buf = 0, nra, error = 0, n = 0, on = 0, not_readin; off_t offdiff; @@ -255,7 +255,7 @@ nfs_write(void *v) struct buf *bp; struct vattr vattr; struct nfsmount *nmp = VFSTONFS(vp->v_mount); - daddr64_t lbn, bn; + daddr_t lbn, bn; int n, on, error = 0, extended = 0, wrotedta = 0, truncated = 0; int overrun; @@ -426,7 +426,7 @@ out: * NULL. */ struct buf * -nfs_getcacheblk(struct vnode *vp, daddr64_t bn, int size, struct proc *p) +nfs_getcacheblk(struct vnode *vp, daddr_t bn, int size, struct proc *p) { struct buf *bp; struct nfsmount *nmp = VFSTONFS(vp->v_mount); diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h index 9ddc8398c20..56a52ac9d95 100644 --- a/sys/nfs/nfs_var.h +++ b/sys/nfs/nfs_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_var.h,v 1.59 2010/04/12 16:37:38 beck Exp $ */ +/* $OpenBSD: nfs_var.h,v 1.60 2013/06/11 16:42:17 deraadt Exp $ */ /* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */ /* @@ -47,7 +47,7 @@ struct nfsm_info; /* nfs_bio.c */ int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *); int nfs_write(void *); -struct buf *nfs_getcacheblk(struct vnode *, daddr64_t, int, struct proc *); +struct buf *nfs_getcacheblk(struct vnode *, daddr_t, int, struct proc *); int nfs_vinvalbuf(struct vnode *, int, struct ucred *, struct proc *); int nfs_asyncio(struct buf *, int readahead); int nfs_doio(struct buf *, struct proc *); |