diff options
| -rw-r--r-- | sys/arch/luna88k/include/disklabel.h | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/disksubr.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/luna88k/include/disklabel.h b/sys/arch/luna88k/include/disklabel.h index 1c65b293642..58d75c91dd8 100644 --- a/sys/arch/luna88k/include/disklabel.h +++ b/sys/arch/luna88k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.6 2015/09/30 14:57:03 krw Exp $ */ +/* $OpenBSD: disklabel.h,v 1.7 2024/11/08 21:47:10 krw Exp $ */ /* * Copyright (c) 1994 Christopher G. Demetriou @@ -34,7 +34,7 @@ #define _MACHINE_DISKLABEL_H_ #define LABELSECTOR 0 /* sector containing label */ -#define LABELOFFSET 64 /* offset of label in sector */ +#define LABELOFFSET 0 /* offset of label in sector */ #define MAXPARTITIONS 16 /* number of partitions */ #endif /* _MACHINE_DISKLABEL_H_ */ diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c index d58ef84e592..f0763bf733a 100644 --- a/sys/arch/luna88k/luna88k/disksubr.c +++ b/sys/arch/luna88k/luna88k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.63 2024/09/04 07:54:51 mglocker Exp $ */ +/* $OpenBSD: disksubr.c,v 1.64 2024/11/08 21:47:10 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */ /* @@ -116,7 +116,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), bp->b_dev = dev; if (spoofonly) - goto done; + goto doslabel; error = readdisksector(bp, strat, lp, DL_BLKTOSEC(lp, LABELSECTOR)); if (error) @@ -128,8 +128,8 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), goto done; } - error = checkdisklabel(bp->b_dev, bp->b_data + LABELOFFSET, lp, 0, - DL_GETDSIZE(lp)); + doslabel: + error = readdoslabel(bp, strat, lp, NULL, spoofonly); if (error == 0) goto done; |