svn commit: r341994 - head/sys/geom/mirror

Conrad Meyer cem at FreeBSD.org
Wed Dec 12 18:13:58 UTC 2018


Author: cem
Date: Wed Dec 12 18:13:56 2018
New Revision: 341994
URL: https://svnweb.freebsd.org/changeset/base/341994

Log:
  gmirror: Remove a last-minute INVARIANTS breakage in r341840
  
  I mistakenly added a lock assertion to this routine at the last minute
  without confirming it was held during g_mirror_create.  It isn't (it isn't
  even initialized yet).  Mea culpa.  Access is exclusive in both callers,
  just not always by that particular lock.
  
  Reported by:	lwhsu
  X-MFC-With:	r341840, r341674

Modified:
  head/sys/geom/mirror/g_mirror.c

Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c	Wed Dec 12 17:05:47 2018	(r341993)
+++ head/sys/geom/mirror/g_mirror.c	Wed Dec 12 18:13:56 2018	(r341994)
@@ -3061,8 +3061,6 @@ g_mirror_reinit_from_metadata(struct g_mirror_softc *s
     const struct g_mirror_metadata *md)
 {
 
-	sx_assert(&sc->sc_lock, SX_XLOCKED);
-
 	sc->sc_genid = md->md_genid;
 	sc->sc_syncid = md->md_syncid;
 


More information about the svn-src-head mailing list