diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 17:15:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-06 17:15:15 +0000 |
| commit | 64b0758a0244e515108eec4f2cd5d05a5939ebf1 (patch) | |
| tree | e5e991586e626374ede95d07956bcaf6a47372be /sys/dev/raidframe/rf_openbsdkintf.c | |
| parent | a0f03208acbc7a85466c7cf68058959c1bbe9668 (diff) | |
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
Diffstat (limited to 'sys/dev/raidframe/rf_openbsdkintf.c')
| -rw-r--r-- | sys/dev/raidframe/rf_openbsdkintf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 7b2b4f2336d..5fddda32e4d 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.36 2007/06/05 00:38:22 deraadt Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.37 2007/06/06 17:15:13 deraadt Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- @@ -181,7 +181,7 @@ int raidioctl(dev_t, u_long, caddr_t, int, struct proc *); int raidwrite(dev_t, struct uio *, int); int raidread(dev_t, struct uio *, int); void raidstrategy(struct buf *); -int raiddump(dev_t, daddr_t, caddr_t, size_t); +int raiddump(dev_t, daddr64_t, caddr_t, size_t); /* * Pilfered from ccd.c @@ -611,7 +611,7 @@ raidsize(dev_t dev) } int -raiddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) +raiddump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size) { /* Not implemented. */ return (ENXIO); @@ -1719,7 +1719,7 @@ raidstart(RF_Raid_t *raidPtr) RF_RaidAddr_t raid_addr; int retcode; struct partition *pp; - daddr_t blocknum; + daddr64_t blocknum; int unit; struct raid_softc *rs; int do_async; @@ -1761,8 +1761,8 @@ raidstart(RF_Raid_t *raidPtr) blocknum += DL_GETPOFFSET(pp); } - db1_printf(("Blocks: %d, %d\n", (int) bp->b_blkno, - (int) blocknum)); + db1_printf(("Blocks: %d, %lld\n", (int) bp->b_blkno, + blocknum)); db1_printf(("bp->b_bcount = %d\n", (int) bp->b_bcount)); db1_printf(("bp->b_resid = %d\n", (int) bp->b_resid)); |