From 9cb9930ea6e54e7228aed09a7808ee825f3f8a64 Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 2 Dec 2006 09:10:29 +0000
Subject: [PATCH] Softc may be NULL in g_journal_orphan(), so don't be
 surprised.

---
 sys/geom/journal/g_journal.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index 8a39e3fc8c3..3edee0a527b 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -390,9 +390,10 @@ g_journal_orphan(struct g_consumer *cp)
 
 	g_topology_assert();
 	sc = cp->geom->softc;
-	GJ_DEBUG(0, "Lost provider %s (journal=%s).", cp->provider->name,
-	    sc->sc_name);
-	strlcpy(name, sc->sc_name, sizeof(name));
+	strlcpy(name, cp->provider->name, sizeof(name));
+	GJ_DEBUG(0, "Lost provider %s.", name);
+	if (sc == NULL)
+		return;
 	error = g_journal_destroy(sc);
 	if (error == 0)
 		GJ_DEBUG(0, "Journal %s destroyed.", name);