diff options
author | phk <phk@FreeBSD.org> | 2002-10-04 10:38:36 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-10-04 10:38:36 +0000 |
commit | 614e9a77740d0b87bb6b0da81dcf347a3ccc895b (patch) | |
tree | d17e06f819e6503e669515647ae9a8c5245bf86e /sys/geom/geom_dump.c | |
parent | 8891e95872a3b7394d1eb5ea93814e7e50689821 (diff) | |
download | FreeBSD-src-614e9a77740d0b87bb6b0da81dcf347a3ccc895b.zip FreeBSD-src-614e9a77740d0b87bb6b0da81dcf347a3ccc895b.tar.gz |
Properly isolate the locking domains of sysctl from the topology lock
for the sysctls which report the configuration.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'sys/geom/geom_dump.c')
-rw-r--r-- | sys/geom/geom_dump.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c index 311b76d..5b29835 100644 --- a/sys/geom/geom_dump.c +++ b/sys/geom/geom_dump.c @@ -99,20 +99,20 @@ g_confdot_class(struct sbuf *sb, struct g_class *mp) g_confdot_geom(sb, gp); } -struct sbuf * -g_confdot(void) +void +g_confdot(void *p) { struct g_class *mp; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); - sbuf_clear(sb); + sb = p; + g_topology_assert(); sbuf_printf(sb, "digraph geom {\n"); LIST_FOREACH(mp, &g_classes, class) g_confdot_class(sb, mp); sbuf_printf(sb, "};\n"); sbuf_finish(sb); - return (sb); + wakeup(p); } @@ -196,14 +196,12 @@ g_conf_class(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_pr sbuf_printf(sb, " </class>\n"); } -struct sbuf * -g_conf_specific(struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) +void +g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) { struct g_class *mp2; - struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); - sbuf_clear(sb); + g_topology_assert(); sbuf_printf(sb, "<mesh>\n"); #ifndef _KERNEL sbuf_printf(sb, " <FreeBSD>%cFreeBSD%c</FreeBSD>\n", '$', '$'); @@ -215,14 +213,14 @@ g_conf_specific(struct g_class *mp, struct g_geom *gp, struct g_provider *pp, st } sbuf_printf(sb, "</mesh>\n"); sbuf_finish(sb); - return (sb); } -struct sbuf * -g_conf() +void +g_confxml(void *p) { - return (g_conf_specific(NULL, NULL, NULL, NULL)); + g_conf_specific(p, NULL, NULL, NULL, NULL); + wakeup(p); } |