diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-17 07:00:46 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-17 07:00:46 +0000 |
| commit | 257eee10f21dd51ed4ab501e1808cacc01b3d029 (patch) | |
| tree | df37d0e82b3cc39e16f3f1dfd5d85cd5dd8922aa /sys/arch | |
| parent | a0620e7f4df5dee609a1c21db9737e180958a959 (diff) | |
Really avoid changing the start of the bounds if we found no LIF
a diff by kettenis but he is gone for a day or so
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa/hppa/disksubr.c | 9 | ||||
| -rw-r--r-- | sys/arch/hppa64/hppa64/disksubr.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c index 962dc450a6a..93ef104997e 100644 --- a/sys/arch/hppa/hppa/disksubr.c +++ b/sys/arch/hppa/hppa/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.74 2009/06/14 00:09:37 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.75 2009/06/17 07:00:43 deraadt Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -113,10 +113,8 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), return "LIF volume header I/O error"; lvp = (struct lifvol *)bp->b_data; - if (lvp->vol_id != LIF_VOL_ID) { - openbsdstart = 0; - goto finished; - } + if (lvp->vol_id != LIF_VOL_ID) + return "no LIF volume header"; dbp = geteblk(LIF_DIRSIZE); dbp->b_dev = bp->b_dev; @@ -129,7 +127,6 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), if (biowait(dbp)) { msg = "LIF directory I/O error"; - openbsdstart = 0; goto done; } diff --git a/sys/arch/hppa64/hppa64/disksubr.c b/sys/arch/hppa64/hppa64/disksubr.c index 65df5fbe288..74c4f77be09 100644 --- a/sys/arch/hppa64/hppa64/disksubr.c +++ b/sys/arch/hppa64/hppa64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.58 2009/06/14 00:09:38 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.59 2009/06/17 07:00:45 deraadt Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -113,10 +113,8 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), return "LIF volume header I/O error"; lvp = (struct lifvol *)bp->b_data; - if (lvp->vol_id != LIF_VOL_ID) { - openbsdstart = 0; - goto finished; - } + if (lvp->vol_id != LIF_VOL_ID) + return "no LIF volume header"; dbp = geteblk(LIF_DIRSIZE); dbp->b_dev = bp->b_dev; @@ -129,7 +127,6 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), if (biowait(dbp)) { msg = "LIF directory I/O error"; - openbsdstart = 0; goto done; } |