Change the bounds_check_with_label API to also take a cpu_disklabel

reference for making transferral of meta-information possible from
readdisklabel to bounds_check_with_label.  The first (and maybe only)
thing that will use this is the multi-disklabel-format code on the
alpha where the labelsector is passed via cpu_disklabel so the label
write-protection can work correctly no matter what label was found.

Also use a new macro DKBAD to get at the dkbad field of the cpu_disklabel
implementations that contain it.  This too is for multi-disklabel
architectures where the "bad" field can be inside a union.  Use this
macro as a means for a driver to check if an architecture supports
dkbad constructs.

Remove proto of bounds_check_with_label from all MD disklabel.h as it
is in sys/disklabel.h.

I have not been able to test the changes everywhere, if I break anything
I apologize, and promise to fix it as soon as I become aware of it.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index f49d8a412f3..54c3f01484b 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mscp_disk.c,v 1.2 1997/05/29 00:05:02 niklas Exp $	*/
+/*	$OpenBSD: mscp_disk.c,v 1.3 1997/08/08 21:46:56 niklas Exp $	*/
 /*	$NetBSD: mscp_disk.c,v 1.7 1997/01/11 11:20:32 ragge Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -382,7 +382,7 @@ rastrategy(bp)
 		}
 	} else
 		if (bounds_check_with_label(bp, ra->ra_disk.dk_label,
-		    ra->ra_wlabel) <= 0) {
+		    ra->ra_disk.dk_cpulabel, ra->ra_wlabel) <= 0) {
 			bp->b_error = ENXIO;
 			goto bad;
 		}