Index: uipc_mbuf.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.116
diff -u -r1.116 uipc_mbuf.c
--- uipc_mbuf.c	15 Apr 2003 02:14:43 -0000	1.116
+++ uipc_mbuf.c	1 Jun 2003 21:23:41 -0000
@@ -53,11 +53,11 @@
 int	max_protohdr;
 int	max_hdr;
 int	max_datalen;
+#ifdef INVARIANTS
 int	m_defragpackets;
 int	m_defragbytes;
 int	m_defraguseless;
 int	m_defragfailure;
-#ifdef MBUF_STRESS_TEST
 int	m_defragrandomfailures;
 #endif
 
@@ -72,6 +72,7 @@
 SYSCTL_INT(_kern_ipc, KIPC_MAX_HDR, max_hdr, CTLFLAG_RW, &max_hdr, 0, "");
 SYSCTL_INT(_kern_ipc, KIPC_MAX_DATALEN, max_datalen, CTLFLAG_RW,
 	   &max_datalen, 0, "");
+#ifdef INVARIANTS
 SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragpackets, CTLFLAG_RD,
 	   &m_defragpackets, 0, "");
 SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragbytes, CTLFLAG_RD,
@@ -80,7 +81,6 @@
 	   &m_defraguseless, 0, "");
 SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragfailure, CTLFLAG_RD,
 	   &m_defragfailure, 0, "");
-#ifdef MBUF_STRESS_TEST
 SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragrandomfailures, CTLFLAG_RW,
 	   &m_defragrandomfailures, 0, "");
 #endif
@@ -852,15 +852,21 @@
 			m_cat(m_final, m_new);
 		m_new = NULL;
 	}
+#ifdef INVARIANTS
 	if (m0->m_next == NULL)
 		m_defraguseless++;
+#endif
 	m_freem(m0);
 	m0 = m_final;
+#ifdef INVARIANTS
 	m_defragpackets++;
 	m_defragbytes += m0->m_pkthdr.len;
+#endif
 	return (m0);
 nospace:
+#ifdef INVARIANTS
 	m_defragfailure++;
+#endif
 	if (m_new)
 		m_free(m_new);
 	if (m_final)