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, 5 deletions

diff --git a/sys/arch/arm32/include/disklabel.h b/sys/arch/arm32/include/disklabel.h
index 51789255abc..cdf8e09bb3f 100644
--- a/sys/arch/arm32/include/disklabel.h
+++ b/sys/arch/arm32/include/disklabel.h
@@ -97,6 +97,8 @@ struct cpu_disklabel {
 	struct dkbad bad;
 };
 
+#define DKBAD(x) ((x)->bad)
+
 struct filecore_bootblock {
 	u_char  padding0[0x1c0];
 	u_char  log2secsize;
@@ -124,11 +126,6 @@ struct filecore_bootblock {
 	u_char checksum;
 };
 
-#ifdef _KERNEL
-struct disklabel;
-int	bounds_check_with_label __P((struct buf *, struct disklabel *, int));
-#endif /* _KERNEL */
-
 #endif /* _ARM32_DISKLABEL_H_ */
 
 /* End of disklabel.h */