summaryrefslogtreecommitdiffstats
path: root/sys/geom/concat/g_concat.h
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2004-05-20 10:40:18 +0000
committerpjd <pjd@FreeBSD.org>2004-05-20 10:40:18 +0000
commitf44a01349d9352e9924655045a111bfb32291b8a (patch)
tree83cbe78b9c984529a8cf0f08a49c3ffdb4cddf00 /sys/geom/concat/g_concat.h
parent3e714a6487c6937bd528d4d2cc70041ecd78f005 (diff)
downloadFreeBSD-src-f44a01349d9352e9924655045a111bfb32291b8a.zip
FreeBSD-src-f44a01349d9352e9924655045a111bfb32291b8a.tar.gz
- Teach CONCAT class how to talk with geom(8).
- Remove provider if any disk was lost. - Dump CONCAT version. Supported by: Wheel - Open Technologies - http://www.wheel.pl
Diffstat (limited to 'sys/geom/concat/g_concat.h')
-rw-r--r--sys/geom/concat/g_concat.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index 43e05b7..013356b 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -34,7 +34,7 @@
#define G_CONCAT_CLASS_NAME "CONCAT"
#define G_CONCAT_MAGIC "GEOM::CONCAT"
-#define G_CONCAT_VERSION 0
+#define G_CONCAT_VERSION 1
#ifdef _KERNEL
#define G_CONCAT_TYPE_MANUAL 0
@@ -42,7 +42,10 @@
#define G_CONCAT_DEBUG(lvl, ...) do { \
if (g_concat_debug >= (lvl)) { \
- printf("GEOM_CONCAT[%u]: ", lvl); \
+ printf("GEOM_CONCAT"); \
+ if (g_concat_debug > 0) \
+ printf("[%u]", lvl); \
+ printf(": "); \
printf(__VA_ARGS__); \
printf("\n"); \
} \
@@ -65,13 +68,14 @@ struct g_concat_disk {
};
struct g_concat_softc {
- u_int sc_type; /* provider type */
+ u_int sc_type; /* provider type */
+ struct g_geom *sc_geom;
struct g_provider *sc_provider;
- char sc_name[16]; /* concat name */
- uint32_t sc_id; /* concat unique ID */
+ char sc_name[16]; /* concat name */
+ uint32_t sc_id; /* concat unique ID */
struct g_concat_disk *sc_disks;
- uint16_t sc_ndisks;
+ uint16_t sc_ndisks;
};
#endif /* _KERNEL */
OpenPOWER on IntegriCloud