diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-06-06 17:15:11 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-06-06 17:15:11 +0000 |
| commit | 15aab03cdee9fcea2507fd66e06a95d6b73cacc9 (patch) | |
| tree | 0b88e48097fa36b5ad5e9ce6601cb33816e2cf93 /sys/dev/vnd.c | |
| parent | oops (diff) | |
| download | wireguard-openbsd-15aab03cdee9fcea2507fd66e06a95d6b73cacc9.tar.xz wireguard-openbsd-15aab03cdee9fcea2507fd66e06a95d6b73cacc9.zip | |
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/vnd.c')
| -rw-r--r-- | sys/dev/vnd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 15777a7df78..eeae63a60cd 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnd.c,v 1.76 2007/06/05 00:38:20 deraadt Exp $ */ +/* $OpenBSD: vnd.c,v 1.77 2007/06/06 17:15:13 deraadt Exp $ */ /* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */ /* @@ -161,13 +161,13 @@ int vndsetcred(struct vnd_softc *, struct ucred *); void vndiodone(struct buf *); void vndshutdown(void); void vndgetdisklabel(dev_t, struct vnd_softc *); -void vndencrypt(struct vnd_softc *, caddr_t, size_t, daddr_t, int); +void vndencrypt(struct vnd_softc *, caddr_t, size_t, daddr64_t, int); #define vndlock(sc) rw_enter(&sc->sc_rwlock, RW_WRITE|RW_INTR) #define vndunlock(sc) rw_exit_write(&sc->sc_rwlock) void -vndencrypt(struct vnd_softc *vnd, caddr_t addr, size_t size, daddr_t off, +vndencrypt(struct vnd_softc *vnd, caddr_t addr, size_t size, daddr64_t off, int encrypt) { int i, bsize; @@ -437,7 +437,7 @@ vndstrategy(struct buf *bp) /* Loop until all queued requests are handled. */ for (;;) { int part = DISKPART(bp->b_dev); - int off = DL_GETPOFFSET(&vnd->sc_dk.dk_label->d_partitions[part]); + daddr64_t off = DL_GETPOFFSET(&vnd->sc_dk.dk_label->d_partitions[part]); aiov.iov_base = bp->b_data; auio.uio_resid = aiov.iov_len = bp->b_bcount; @@ -997,7 +997,7 @@ vndclear(struct vnd_softc *vnd) vnd->sc_size = 0; } -int +daddr64_t vndsize(dev_t dev) { int unit = vndunit(dev); @@ -1009,7 +1009,7 @@ vndsize(dev_t dev) } int -vnddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) +vnddump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size) { /* Not implemented. */ |