svn commit: r349015 - stable/12/sys/net

[Mark Johnston]

Author: markj
Date: Thu Jun 13 16:33:01 2019
New Revision: 349015
URL: https://svnweb.freebsd.org/changeset/base/349015

Log:
  MFC r348745, r348751:
  Conditionalize an in_epoch() call on INVARIANTS.

Modified:
  stable/12/sys/net/if_lagg.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/if_lagg.c
==============================================================================
--- stable/12/sys/net/if_lagg.c	Thu Jun 13 16:32:03 2019	(r349014)
+++ stable/12/sys/net/if_lagg.c	Thu Jun 13 16:33:01 2019	(r349015)
@@ -1857,12 +1857,14 @@ lagg_link_active(struct lagg_softc *sc, struct lagg_po
 	 * Search a port which reports an active link state.
 	 */
 
+#ifdef INVARIANTS
 	/*
 	 * This is called with either LAGG_RLOCK() held or
 	 * LAGG_XLOCK(sc) held.
 	 */
 	if (!in_epoch(net_epoch_preempt))
 		LAGG_XLOCK_ASSERT(sc);
+#endif
 
 	if (lp == NULL)
 		goto search;