now that all partition size/offsets are potentially 64-bit, change the

type of all variables to daddr64_t.  this includes the APIs for XXsize()
and XXdump(), all range checks inside bio drivers, internal variables
for disklabel handling, and even uvm's swap offsets.  re-read numerous
times by otto, miod, krw, thib to look for errors

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/dev/flash.c b/sys/dev/flash.c
index c96562cb342..bdc1c6650f5 100644
--- a/sys/dev/flash.c
+++ b/sys/dev/flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flash.c,v 1.4 2007/06/05 00:38:20 deraadt Exp $	*/
+/*	$OpenBSD: flash.c,v 1.5 2007/06/06 17:15:13 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -865,13 +865,13 @@ flashioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p)
 }
 
 int
-flashdump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
+flashdump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size)
 {
 	printf("flashdump\n");
 	return ENODEV;
 }
 
-int
+daddr64_t
 flashsize(dev_t dev)
 {
 	printf("flashsize\n");
@@ -900,7 +900,7 @@ void
 _flashstart(struct flash_softc *sc, struct buf *bp)
 {
 	int part;
-	long offset;
+	daddr64_t offset;
 	long pgno;
 
 	part = flashpart(bp->b_dev);