Author: mckusick
Date: Tue Feb 6 19:17:40 2018
New Revision: 328948
URL: https://svnweb.freebsd.org/changeset/base/328948
Log:
MFC of 328647.
avoid segment fault in g_journal
Modified:
stable/10/sys/geom/journal/g_journal.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/geom/journal/g_journal.c
==============================================================================
--- stable/10/sys/geom/journal/g_journal.c Tue Feb 6 19:17:05 2018
(r328947)
+++ stable/10/sys/geom/journal/g_journal.c Tue Feb 6 19:17:40 2018
(r328948)
@@ -2433,6 +2433,7 @@ g_journal_destroy(struct g_journal_softc *sc)
sc->sc_current_count);
}
+ gp->softc = NULL;
LIST_FOREACH(cp, &gp->consumer, consumer) {
if (cp->acr + cp->acw + cp->ace > 0)
g_access(cp, -1, -1, -1);
@@ -2444,7 +2445,6 @@ g_journal_destroy(struct g_journal_softc *sc)
*/
g_post_event(g_journal_destroy_consumer, cp, M_WAITOK, NULL);
}
- gp->softc = NULL;
g_wither_geom(gp, ENXIO);
free(sc, M_JOURNAL);
return (0);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
