convert all daddr_t types to either daddr64_t or uint32_t or other such

things based on their use.  ok with fixes from tom, tested by grange too

4 files changed, 13 insertions, 14 deletions

diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index 7190e8f37df..03b648587a5 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: denode.h,v 1.20 2007/03/18 15:05:33 mickey Exp $	*/
+/*	$OpenBSD: denode.h,v 1.21 2007/06/02 02:04:21 deraadt Exp $	*/
 /*	$NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $	*/
 
 /*-
@@ -141,7 +141,7 @@ struct denode {
 	struct vnode *de_devvp;	/* vnode of blk dev we live on */
 	uint32_t de_flag;		/* flag bits */
 	dev_t de_dev;		/* device where direntry lives */
-	daddr_t de_lastr;
+	daddr64_t de_lastr;
 	uint32_t de_dirclust;	/* cluster of the directory file containing this entry */
 	uint32_t de_diroffset;	/* offset of this entry in the directory cluster */
 	uint32_t de_fndoffset;	/* offset of found dir entry */
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 647a447e3f9..8e7ff21add4 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.31 2007/06/01 23:47:57 deraadt Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.32 2007/06/02 02:04:21 deraadt Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -383,7 +383,7 @@ detrunc(dep, length, flags, cred, p)
 	int vflags;
 	uint32_t eofentry;
 	uint32_t chaintofree;
-	daddr_t bn;
+	daddr64_t bn;
 	int boff;
 	int isadir = dep->de_Attributes & ATTR_DIRECTORY;
 	struct buf *bp;
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 9543058b362..d671033e408 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_lookup.c,v 1.18 2007/06/01 23:47:57 deraadt Exp $	*/
+/*	$OpenBSD: msdosfs_lookup.c,v 1.19 2007/06/02 02:04:21 deraadt Exp $	*/
 /*	$NetBSD: msdosfs_lookup.c,v 1.34 1997/10/18 22:12:27 ws Exp $	*/
 
 /*-
@@ -801,7 +801,7 @@ doscheckpath(source, target)
 	struct denode *source;
 	struct denode *target;
 {
-	daddr_t scn;
+	uint32_t scn;
 	struct msdosfsmount *pmp;
 	struct direntry *ep;
 	struct denode *dep;
@@ -893,7 +893,7 @@ readep(pmp, dirclust, diroffset, bpp, epp)
 	struct direntry **epp;
 {
 	int error;
-	daddr_t bn;
+	daddr64_t bn;
 	int blsize;
 	uint32_t boff;
 
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index aedd986adf0..27e3d9b2302 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.63 2007/06/01 23:47:57 deraadt Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.64 2007/06/02 02:04:21 deraadt Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -519,8 +519,8 @@ msdosfs_write(v)
 	int resid;
 	uint32_t osize;
 	int error = 0;
-	uint32_t count;
-	daddr_t bn, lastcn;
+	uint32_t count, lastcn;
+	daddr64_t bn;
 	struct buf *bp;
 	int ioflag = ap->a_ioflag;
 	struct uio *uio = ap->a_uio;
@@ -863,7 +863,7 @@ msdosfs_rename(v)
 	int doingdirectory = 0, newparent = 0;
 	int error;
 	uint32_t cn, pcl;
-	daddr_t bn;
+	daddr64_t bn;
 	struct msdosfsmount *pmp;
 	struct direntry *dotdotp;
 	struct buf *bp;
@@ -1191,7 +1191,7 @@ msdosfs_mkdir(v)
 	struct denode *dep;
 	struct denode *pdep = VTODE(ap->a_dvp);
 	int error;
-	int bn;
+	daddr64_t bn;
 	uint32_t newcluster, pcl;
 	struct direntry *denp;
 	struct msdosfsmount *pmp = pdep->de_pmp;
@@ -1381,10 +1381,9 @@ msdosfs_readdir(v)
 	long lost;
 	long count;
 	uint32_t dirsperblk;
-	uint32_t cn;
+	uint32_t cn, lbn;
 	uint32_t fileno;
 	long bias = 0;
-	daddr_t lbn;
 	daddr64_t bn;
 	struct buf *bp;
 	struct denode *dep = VTODE(ap->a_vp);