svn commit: r265488 - stable/10/sys/dev/iscsi

[Edward Tomasz Napierala]

Author: trasz
Date: Wed May  7 06:12:59 2014
New Revision: 265488
URL: http://svnweb.freebsd.org/changeset/base/265488

Log:
  MFC r263743:
  
  Move the ic_outstanding_count under #ifdef DIAGNOSTIC.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/iscsi/icl.c
  stable/10/sys/dev/iscsi/icl.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/iscsi/icl.c
==============================================================================
--- stable/10/sys/dev/iscsi/icl.c	Wed May  7 06:10:55 2014	(r265487)
+++ stable/10/sys/dev/iscsi/icl.c	Wed May  7 06:12:59 2014	(r265488)
@@ -135,11 +135,15 @@ icl_pdu_new(struct icl_conn *ic, int fla
 {
 	struct icl_pdu *ip;
 
+#ifdef DIAGNOSTIC
 	refcount_acquire(&ic->ic_outstanding_pdus);
+#endif
 	ip = uma_zalloc(icl_pdu_zone, flags | M_ZERO);
 	if (ip == NULL) {
 		ICL_WARN("failed to allocate %zd bytes", sizeof(*ip));
+#ifdef DIAGNOSTIC
 		refcount_release(&ic->ic_outstanding_pdus);
+#endif
 		return (NULL);
 	}
 
@@ -159,7 +163,9 @@ icl_pdu_free(struct icl_pdu *ip)
 	m_freem(ip->ip_ahs_mbuf);
 	m_freem(ip->ip_data_mbuf);
 	uma_zfree(icl_pdu_zone, ip);
+#ifdef DIAGNOSTIC
 	refcount_release(&ic->ic_outstanding_pdus);
+#endif
 }
 
 /*
@@ -977,7 +983,9 @@ icl_conn_new(void)
 	mtx_init(&ic->ic_lock, "icl_lock", NULL, MTX_DEF);
 	cv_init(&ic->ic_send_cv, "icl_tx");
 	cv_init(&ic->ic_receive_cv, "icl_rx");
+#ifdef DIAGNOSTIC
 	refcount_init(&ic->ic_outstanding_pdus, 0);
+#endif
 	ic->ic_max_data_segment_length = ICL_MAX_DATA_SEGMENT_LENGTH;
 
 	return (ic);

Modified: stable/10/sys/dev/iscsi/icl.h
==============================================================================
--- stable/10/sys/dev/iscsi/icl.h	Wed May  7 06:10:55 2014	(r265487)
+++ stable/10/sys/dev/iscsi/icl.h	Wed May  7 06:12:59 2014	(r265488)
@@ -76,7 +76,9 @@ void			icl_pdu_free(struct icl_pdu *ip);
 struct icl_conn {
 	struct mtx		ic_lock;
 	struct socket		*ic_socket;
+#ifdef DIAGNOSTIC
 	volatile u_int		ic_outstanding_pdus;
+#endif
 	TAILQ_HEAD(, icl_pdu)	ic_to_send;
 	size_t			ic_receive_len;
 	int			ic_receive_state;