diff options
| author |   krw <krw@openbsd.org> | 2013-10-19 09:32:12 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-10-19 09:32:12 +0000 |
| commit | c5eb333467ab387509372eccc74d9ff930477284 (patch) | |
| tree | ae780ae22d09b571f35dea892b7ee421de55aeb9 /sys/kern/subr_disk.c | |
| parent | When hooks are called, allow them to disestablish themselves by using (diff) | |
| download | wireguard-openbsd-c5eb333467ab387509372eccc74d9ff930477284.tar.xz wireguard-openbsd-c5eb333467ab387509372eccc74d9ff930477284.zip | |
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/subr_disk.c')
| -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; |