diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-27 15:23:10 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-09-27 15:23:10 +0000 |
| commit | 5d6723bde33bf155b68535e4ebd32d15bf38e24d (patch) | |
| tree | 38578983d2e81007d67d345f25775c79fe785f61 | |
| parent | af6710b58c4d9d60ae7e526303e45e7eba773d90 (diff) | |
Tweak a bit of daddr_t goodness and make hppa64 disksubr.c identical to
hppa disksubr.c.
ok kettenis@
| -rw-r--r-- | sys/arch/hppa64/hppa64/disksubr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c index df8666601b1..8885fb9d405 100644 --- a/sys/arch/hppa64/hppa64/disksubr.c +++ b/sys/arch/hppa64/hppa64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.70 2015/09/27 12:29:21 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.71 2015/09/27 15:23:09 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -98,7 +98,8 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct lifdir *p; struct lifvol *lvp; int error = 0; - int fsoff = 0, openbsdstart = MAXLIFSPACE, i; + daddr_t fsoff = 0, openbsdstart = MAXLIFSPACE; + int i; /* read LIF volume header */ bp->b_blkno = btodb(LIF_VOLSTART); @@ -212,7 +213,7 @@ finished: if (partoffp) *partoffp = fsoff; else { - DL_SETBSTART(lp, openbsdstart); + DL_SETBSTART(lp, DL_BLKTOSEC(lp, openbsdstart)); DL_SETBEND(lp, DL_GETDSIZE(lp)); /* XXX */ } |