summaryrefslogtreecommitdiffstats
path: root/sys/geom/geom_dump.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-04-02 21:10:04 +0000
committerphk <phk@FreeBSD.org>2003-04-02 21:10:04 +0000
commit39cbb43bab476ff3c79356e36f26e51a6b90a692 (patch)
tree629b1f684f16eeb00568b7d1a2df6af64778ddf7 /sys/geom/geom_dump.c
parentcedf04c4758318e15e1a5924e4226bb5a9699107 (diff)
downloadFreeBSD-src-39cbb43bab476ff3c79356e36f26e51a6b90a692.zip
FreeBSD-src-39cbb43bab476ff3c79356e36f26e51a6b90a692.tar.gz
Add handling for cancelled events in the g_call_me() methods.
Diffstat (limited to 'sys/geom/geom_dump.c')
-rw-r--r--sys/geom/geom_dump.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index 1c39fc2..6d2a3de 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -101,11 +101,12 @@ g_confdot_class(struct sbuf *sb, struct g_class *mp)
}
void
-g_confdot(void *p, int flag __unused)
+g_confdot(void *p, int flag )
{
struct g_class *mp;
struct sbuf *sb;
+ KASSERT(flag != EV_CANCEL, ("g_confdot was cancelled"));
sb = p;
g_topology_assert();
sbuf_printf(sb, "digraph geom {\n");
@@ -143,11 +144,12 @@ g_conftxt_class(struct sbuf *sb, struct g_class *mp)
}
void
-g_conftxt(void *p, int flag __unused)
+g_conftxt(void *p, int flag)
{
struct g_class *mp;
struct sbuf *sb;
+ KASSERT(flag != EV_CANCEL, ("g_conftxt was cancelled"));
sb = p;
g_topology_assert();
LIST_FOREACH(mp, &g_classes, class)
@@ -263,9 +265,10 @@ g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g
}
void
-g_confxml(void *p, int flag __unused)
+g_confxml(void *p, int flag)
{
+ KASSERT(flag != EV_CANCEL, ("g_confxml was cancelled"));
g_topology_assert();
g_conf_specific(p, NULL, NULL, NULL, NULL);
wakeup(p);
OpenPOWER on IntegriCloud