svn commit: r316711 - stable/11/sys/geom/mirror

[Mark Johnston]

Author: markj
Date: Tue Apr 11 17:17:05 2017
New Revision: 316711
URL: https://svnweb.freebsd.org/changeset/base/316711

Log:
  MFC r316032:
  Refine r301173 a bit.

Modified:
  stable/11/sys/geom/mirror/g_mirror.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/11/sys/geom/mirror/g_mirror.c	Tue Apr 11 17:16:15 2017	(r316710)
+++ stable/11/sys/geom/mirror/g_mirror.c	Tue Apr 11 17:17:05 2017	(r316711)
@@ -3011,7 +3011,7 @@ g_mirror_destroy(struct g_mirror_softc *
 	g_topology_assert_not();
 	sx_assert(&sc->sc_lock, SX_XLOCKED);
 
-	if (sc->sc_provider_open != 0 || SCHEDULER_STOPPED()) {
+	if (sc->sc_provider_open != 0) {
 		switch (how) {
 		case G_MIRROR_DESTROY_SOFT:
 			G_MIRROR_DEBUG(1,
@@ -3330,6 +3330,9 @@ g_mirror_shutdown_post_sync(void *arg, i
 	struct g_mirror_softc *sc;
 	int error;
 
+	if (panicstr != NULL)
+		return;
+
 	mp = arg;
 	g_topology_lock();
 	g_mirror_shutdown = 1;