Use daddr64_t for logical blocks, okay krw@ thib@ mickey@

13 files changed, 55 insertions, 58 deletions

diff --git a/share/man/man9/VOP_LOOKUP.9 b/share/man/man9/VOP_LOOKUP.9
index 4f6a9979745..2782305f64e 100644
--- a/share/man/man9/VOP_LOOKUP.9
+++ b/share/man/man9/VOP_LOOKUP.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: VOP_LOOKUP.9,v 1.17 2006/10/04 14:04:06 pedro Exp $
+.\" $OpenBSD: VOP_LOOKUP.9,v 1.18 2006/10/16 11:27:52 pedro Exp $
 .\"
 .\" Copyright (c) 2003 Ted Unangst
 .\" All rights reserved.
@@ -54,7 +54,7 @@
 .Ft int
 .Fo VOP_BMAP
 .Fa "struct vnode *vp"
-.Fa "daddr_t bn"
+.Fa "daddr64_t bn"
 .Fa "struct vnode **vpp"
 .Fa "daddr64_t *bnp"
 .Fa "int *runp"
diff --git a/share/man/man9/buffercache.9 b/share/man/man9/buffercache.9
index 90b255723ff..4ec22adb275 100644
--- a/share/man/man9/buffercache.9
+++ b/share/man/man9/buffercache.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: buffercache.9,v 1.3 2004/11/30 14:48:00 pedro Exp $
+.\"	$OpenBSD: buffercache.9,v 1.4 2006/10/16 11:27:52 pedro Exp $
 .\"     $NetBSD: buffercache.9,v 1.13 2004/06/25 15:31:37 wiz Exp $
 .\"
 .\" Copyright (c)2003 YAMAMOTO Takashi,
@@ -124,11 +124,11 @@
 .Sh SYNOPSIS
 .In sys/buf.h
 .Ft int
-.Fn bread "struct vnode *vp" "daddr_t blkno" "int size" \
+.Fn bread "struct vnode *vp" "daddr64_t blkno" "int size" \
 "struct ucred *cred" "struct buf **bpp"
 .Ft int
-.Fn breadn "struct vnode *vp" "daddr_t blkno" "int size" \
-"daddr_t rablks[]" "int rasizes[]" "int nrablks" \
+.Fn breadn "struct vnode *vp" "daddr64_t blkno" "int size" \
+"daddr64_t rablks[]" "int rasizes[]" "int nrablks" \
 "struct ucred *cred" "struct buf **bpp"
 .Ft int
 .Fn bwrite "struct buf *bp"
@@ -137,12 +137,12 @@
 .Ft void
 .Fn bdwrite "struct buf *bp"
 .Ft struct buf *
-.Fn getblk "struct vnode *vp" "daddr_t blkno" "int size" \
+.Fn getblk "struct vnode *vp" "daddr64_t blkno" "int size" \
 "int slpflag" "int slptimeo"
 .Ft struct buf *
 .Fn geteblk "int size"
 .Ft struct buf *
-.Fn incore "struct vnode *vp" "daddr_t blkno"
+.Fn incore "struct vnode *vp" "daddr64_t blkno"
 .Ft void
 .Fn allocbuf "struct buf *bp" "int size"
 .Ft void
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 4f35cea258e..b1f367fd4e0 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.35 2006/10/03 19:49:06 pedro Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.36 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -351,7 +351,7 @@ cd9660_read(v)
 #define MAX_RA 32
 			if (ci->ci_lastr + 1 == lbn) {
 				struct ra {
-					daddr_t blks[MAX_RA];
+					daddr64_t blks[MAX_RA];
 					int sizes[MAX_RA];
 				} *ra;
 				int i;
diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c
index ac8aceab9e7..72e7198b94a 100644
--- a/sys/isofs/udf/udf_vnops.c
+++ b/sys/isofs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vnops.c,v 1.20 2006/07/09 04:23:09 pedro Exp $	*/
+/*	$OpenBSD: udf_vnops.c,v 1.21 2006/10/16 11:27:53 pedro Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -55,7 +55,7 @@
 #include <isofs/udf/udf.h>
 #include <isofs/udf/udf_extern.h>
 
-int udf_bmap_internal(struct unode *, off_t, daddr_t *, uint32_t *);
+int udf_bmap_internal(struct unode *, off_t, daddr64_t *, uint32_t *);
 
 int (**udf_vnodeop_p)(void *);
 struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
@@ -970,7 +970,7 @@ udf_bmap(void *v)
 	} */ *ap = v;
 	struct unode *up;
 	uint32_t max_size;
-	daddr_t lsector;
+	daddr64_t lsector;
 	int error;
 
 	up = VTOU(ap->a_vp);
@@ -1224,7 +1224,7 @@ udf_readatoffset(struct unode *up, int *size, off_t offset,
 	struct file_entry *fentry = NULL;
 	struct buf *bp1;
 	uint32_t max_size;
-	daddr_t sector;
+	daddr64_t sector;
 	int error;
 
 	ump = up->u_ump;
@@ -1265,7 +1265,7 @@ udf_readatoffset(struct unode *up, int *size, off_t offset,
  * block.
  */
 int
-udf_bmap_internal(struct unode *up, off_t offset, daddr_t *sector,
+udf_bmap_internal(struct unode *up, off_t offset, daddr64_t *sector,
     uint32_t *max_size)
 {
 	struct umount *ump;
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 23b86b9c1c8..4b8c38995a7 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.35 2006/07/12 19:56:18 thib Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.36 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -236,7 +236,7 @@ spec_read(v)
 	register struct uio *uio = ap->a_uio;
  	struct proc *p = uio->uio_procp;
 	struct buf *bp;
-	daddr_t bn, nextbn;
+	daddr64_t bn, nextbn;
 	long bsize, bscale, ssize;
 	struct partinfo dpart;
 	int n, on, majordev;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 9517ca9e7bd..01ea582475c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.84 2006/08/28 16:15:29 tom Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.85 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*-
@@ -101,7 +101,7 @@ struct pool bufpool;
 #define	binsheadfree(bp, dp)	TAILQ_INSERT_HEAD(dp, bp, b_freelist)
 #define	binstailfree(bp, dp)	TAILQ_INSERT_TAIL(dp, bp, b_freelist)
 
-static __inline struct buf *bio_doread(struct vnode *, daddr_t, int, int);
+static __inline struct buf *bio_doread(struct vnode *, daddr64_t, int, int);
 struct buf *getnewbuf(int, int, int *);
 
 /*
@@ -232,7 +232,7 @@ bufinit(void)
 }
 
 static __inline struct buf *
-bio_doread(struct vnode *vp, daddr_t blkno, int size, int async)
+bio_doread(struct vnode *vp, daddr64_t blkno, int size, int async)
 {
 	struct buf *bp;
 
@@ -261,7 +261,7 @@ bio_doread(struct vnode *vp, daddr_t blkno, int size, int async)
  * This algorithm described in Bach (p.54).
  */
 int
-bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *cred,
+bread(struct vnode *vp, daddr64_t blkno, int size, struct ucred *cred,
     struct buf **bpp)
 {
 	struct buf *bp;
@@ -278,7 +278,7 @@ bread(struct vnode *vp, daddr_t blkno, int size, struct ucred *cred,
  * Trivial modification to the breada algorithm presented in Bach (p.55).
  */
 int
-breadn(struct vnode *vp, daddr_t blkno, int size, daddr_t rablks[],
+breadn(struct vnode *vp, daddr64_t blkno, int size, daddr64_t rablks[],
     int rasizes[], int nrablks, struct ucred *cred, struct buf **bpp)
 {
 	struct buf *bp;
@@ -571,7 +571,7 @@ brelse(struct buf *bp)
  * chain. If it's there, return a pointer to it, unless it's marked invalid.
  */
 struct buf *
-incore(struct vnode *vp, daddr_t blkno)
+incore(struct vnode *vp, daddr64_t blkno)
 {
 	struct buf *bp;
 
@@ -594,7 +594,7 @@ incore(struct vnode *vp, daddr_t blkno)
  * cached blocks be of the correct size.
  */
 struct buf *
-getblk(struct vnode *vp, daddr_t blkno, int size, int slpflag, int slptimeo)
+getblk(struct vnode *vp, daddr64_t blkno, int size, int slpflag, int slptimeo)
 {
 	struct bufhashhdr *bh;
 	struct buf *bp;
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index e00595107d9..d104ec12934 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cluster.c,v 1.35 2006/10/03 19:49:06 pedro Exp $	*/
+/*	$OpenBSD: vfs_cluster.c,v 1.36 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $	*/
 
 /*
@@ -45,10 +45,11 @@
 
 void cluster_callback(struct buf *);
 struct buf *cluster_newbuf(struct vnode *, struct buf *, long, daddr64_t,
-    daddr_t, long, int);
-struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *, daddr_t,
+    daddr64_t, long, int);
+struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *, daddr64_t,
     daddr64_t, long, int, long);
-void cluster_wbuild(struct vnode *, struct buf *, long, daddr_t, int, daddr_t);
+void cluster_wbuild(struct vnode *, struct buf *, long, daddr64_t, int,
+    daddr64_t);
 struct cluster_save *cluster_collectbufs(struct vnode *, struct cluster_info *,
     struct buf *);
 
@@ -96,11 +97,10 @@ int	doclusterraz = 0;
  */
 int
 cluster_read(struct vnode *vp, struct cluster_info *ci, u_quad_t filesize,
-    daddr_t lblkno, long size, struct ucred *cred, struct buf **bpp)
+    daddr64_t lblkno, long size, struct ucred *cred, struct buf **bpp)
 {
 	struct buf *bp, *rbp;
-	daddr64_t blkno;
-	daddr_t ioblkno;
+	daddr64_t blkno, ioblkno;
 	long flags;
 	int error, num_ra, alreadyincore;
 
@@ -260,11 +260,11 @@ skip_readahead:
  */
 struct buf *
 cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
-    daddr_t lbn, daddr64_t blkno, long size, int run, long flags)
+    daddr64_t lbn, daddr64_t blkno, long size, int run, long flags)
 {
 	struct cluster_save *b_save;
 	struct buf *tbp;
-	daddr_t bn;
+	daddr64_t bn;
 	int i, inc;
 
 #ifdef DIAGNOSTIC
@@ -359,7 +359,7 @@ cluster_rbuild(struct vnode *vp, u_quad_t filesize, struct buf *bp,
  */
 struct buf *
 cluster_newbuf(struct vnode *vp, struct buf *bp, long flags, daddr64_t blkno,
-    daddr_t lblkno, long size, int run)
+    daddr64_t lblkno, long size, int run)
 {
 	if (!bp) {
 		bp = getblk(vp, lblkno, size, 0, 0);
@@ -460,7 +460,7 @@ void
 cluster_write(struct buf *bp, struct cluster_info *ci, u_quad_t filesize)
 {
 	struct vnode *vp;
-	daddr_t lbn;
+	daddr64_t lbn;
 	int maxclen, cursize;
 
 	vp = bp->b_vp;
@@ -568,7 +568,7 @@ cluster_write(struct buf *bp, struct cluster_info *ci, u_quad_t filesize)
  */
 void
 cluster_wbuild(struct vnode *vp, struct buf *last_bp, long size,
-    daddr_t start_lbn, int len, daddr_t lbn)
+    daddr64_t start_lbn, int len, daddr64_t lbn)
 {
 	struct cluster_save *b_save;
 	struct buf *bp, *tbp;
@@ -723,7 +723,7 @@ cluster_collectbufs(struct vnode *vp, struct cluster_info *ci,
     struct buf *last_bp)
 {
 	struct cluster_save *buflist;
-	daddr_t	lbn;
+	daddr64_t lbn;
 	int i, len;
 
 	len = ci->ci_lastw - ci->ci_cstart + 1;
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index f16274ee4fe..bc7422c1b37 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -1,4 +1,4 @@
-#	$OpenBSD: vnode_if.src,v 1.30 2006/10/03 19:49:06 pedro Exp $
+#	$OpenBSD: vnode_if.src,v 1.31 2006/10/16 11:27:53 pedro Exp $
 #	$NetBSD: vnode_if.src,v 1.10 1996/05/11 18:26:27 mycroft Exp $
 #
 # Copyright (c) 1992, 1993
@@ -396,7 +396,7 @@ vop_unlock {
 
 vop_bmap {
 	IN SHOULDBELOCKED struct vnode *vp;
-	IN daddr_t bn;
+	IN daddr64_t bn;
 	OUT struct vnode **vpp;
 	IN daddr64_t *bnp;
 	OUT int *runp;
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 23b86b9c1c8..4b8c38995a7 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.35 2006/07/12 19:56:18 thib Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.36 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -236,7 +236,7 @@ spec_read(v)
 	register struct uio *uio = ap->a_uio;
  	struct proc *p = uio->uio_procp;
 	struct buf *bp;
-	daddr_t bn, nextbn;
+	daddr64_t bn, nextbn;
 	long bsize, bscale, ssize;
 	struct partinfo dpart;
 	int n, on, majordev;
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index c17b725e8c4..14c457320d9 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.57 2006/10/03 19:49:06 pedro Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.58 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -469,9 +469,7 @@ msdosfs_read(v)
 	int isadir;
 	uint32_t n;
 	long on;
-	daddr64_t lbn;
-	daddr_t rablock;
-	daddr_t rablkno;
+	daddr64_t lbn, rablock, rablkno;
 	struct buf *bp;
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 4abd1aaf12d..9e42563d671 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.h,v 1.50 2006/10/03 19:49:06 pedro Exp $	*/
+/*	$OpenBSD: buf.h,v 1.51 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: buf.h,v 1.25 1997/04/09 21:12:17 mycroft Exp $	*/
 
 /*
@@ -87,7 +87,7 @@ struct buf {
 		caddr_t	b_addr;		/* Memory, superblocks, indirect etc. */
 	} b_un;
 	void	*b_saveaddr;		/* Original b_addr for physio. */
-	daddr_t	b_lblkno;		/* Logical block number. */
+	daddr64_t	b_lblkno;	/* Logical block number. */
 	daddr64_t	b_blkno;	/* Underlying physical block number. */
 					/* Function to call upon completion.
 					 * Will be called at splbio(). */
@@ -226,19 +226,18 @@ void	bawrite(struct buf *);
 void	bdwrite(struct buf *);
 void	biodone(struct buf *);
 int	biowait(struct buf *);
-int	bread(struct vnode *, daddr_t, int,
-		   struct ucred *, struct buf **);
-int	breadn(struct vnode *, daddr_t, int, daddr_t *, int *, int,
-		    struct ucred *, struct buf **);
+int bread(struct vnode *, daddr64_t, int, struct ucred *, struct buf **);
+int breadn(struct vnode *, daddr64_t, int, daddr64_t *, int *, int,
+    struct ucred *, struct buf **);
 void	brelse(struct buf *);
 void	bremfree(struct buf *);
 void	bufinit(void);
 void	buf_dirty(struct buf *);
 void    buf_undirty(struct buf *);
 int	bwrite(struct buf *);
-struct buf *getblk(struct vnode *, daddr_t, int, int, int);
+struct buf *getblk(struct vnode *, daddr64_t, int, int, int);
 struct buf *geteblk(int);
-struct buf *incore(struct vnode *, daddr_t);
+struct buf *incore(struct vnode *, daddr64_t);
 
 void	minphys(struct buf *bp);
 int	physio(void (*strategy)(struct buf *), struct buf *bp, dev_t dev,
@@ -292,7 +291,7 @@ buf_countdeps(struct buf *bp, int i, int islocked)
 }
 
 int	cluster_read(struct vnode *, struct cluster_info *,
-	    u_quad_t, daddr_t, long, struct ucred *, struct buf **);
+	    u_quad_t, daddr64_t, long, struct ucred *, struct buf **);
 void	cluster_write(struct buf *, struct cluster_info *, u_quad_t);
 
 __END_DECLS
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index 49819d64432..b5562f212f3 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.17 2005/04/30 13:58:55 niallo Exp $	*/
+/*	$OpenBSD: ext2fs_readwrite.c,v 1.18 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $	*/
 
 /*-
@@ -76,7 +76,7 @@ ext2fs_read(v)
 	struct uio *uio;
 	struct m_ext2fs *fs;
 	struct buf *bp;
-	ufs1_daddr_t lbn, nextlbn;
+	daddr64_t lbn, nextlbn;
 	off_t bytesinfile;
 	long size, xfersize, blkoffset;
 	int error;
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index 0599c98c8c1..1c0cfb25905 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_readwrite.c,v 1.28 2005/12/28 20:48:18 pedro Exp $	*/
+/*	$OpenBSD: ufs_readwrite.c,v 1.29 2006/10/16 11:27:53 pedro Exp $	*/
 /*	$NetBSD: ufs_readwrite.c,v 1.9 1996/05/11 18:27:57 mycroft Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ READ(void *v)
 	struct uio *uio;
 	FS *fs;
 	struct buf *bp;
-	daddr_t lbn, nextlbn;
+	daddr64_t lbn, nextlbn;
 	off_t bytesinfile;
 	long size, xfersize, blkoffset;
 	mode_t mode;