diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-10-19 09:32:16 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-10-19 09:32:16 +0000 |
| commit | debcb7ced82dc346fc1a7d576edfa8dbe12a4038 (patch) | |
| tree | 34fe00c1c59eb80e09e06277ef0e4d66f78f427a /sys/kern | |
| parent | dc05eaace09fc998d4d12fd34621f2a18b1e139d (diff) | |
Use daddr_t * instead of int * for the partoffp parameter to
readdoslabel(). Ditto all the MD variables whose addresses are passed
to readdoslabel() via partoffp.
Fix some 512-byte block vs disk sector confusion in hppa and sgi.
All the DL_GETxxxxx() defines return disk sector values. All
DL_SETxxxx() take disk sector values. These changes should be no-ops
until a drive using non-512-byte-sectors is encountered.
ok deraadt@
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_disk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 155f3eb0983..ed23b32b8bd 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.154 2013/10/14 23:35:53 krw Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.155 2013/10/19 09:32:15 krw Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -385,7 +385,7 @@ checkdisklabel(void *rlp, struct disklabel *lp, u_int64_t boundstart, */ int readdoslabel(struct buf *bp, void (*strat)(struct buf *), - struct disklabel *lp, int *partoffp, int spoofonly) + struct disklabel *lp, daddr_t *partoffp, int spoofonly) { u_int64_t dospartoff = 0, dospartend = DL_GETBEND(lp); int i, ourpart = -1, wander = 1, n = 0, loop = 0, offset; |