Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Feb 2015 14:15:18 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r278359 - head/sys/dev/iscsi
Message-ID:  <201502071415.t17EFIN3016951@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Sat Feb  7 14:15:17 2015
New Revision: 278359
URL: https://svnweb.freebsd.org/changeset/base/278359

Log:
  Tidy up; no functional changes.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/iscsi/icl_soft.c

Modified: head/sys/dev/iscsi/icl_soft.c
==============================================================================
--- head/sys/dev/iscsi/icl_soft.c	Sat Feb  7 13:26:13 2015	(r278358)
+++ head/sys/dev/iscsi/icl_soft.c	Sat Feb  7 14:15:17 2015	(r278359)
@@ -29,8 +29,7 @@
  */
 
 /*
- * iSCSI Common Layer.  It's used by both the initiator and target to send
- * and receive iSCSI PDUs.
+ * Software implementation of iSCSI Common Layer kobj(9) interface.
  */
 
 #include <sys/cdefs.h>
@@ -117,8 +116,6 @@ static kobj_method_t icl_soft_methods[] 
 
 DEFINE_CLASS(icl_soft, icl_soft_methods, sizeof(struct icl_conn));
 
-static void	icl_conn_close(struct icl_conn *ic);
-
 static void
 icl_conn_fail(struct icl_conn *ic)
 {
@@ -201,6 +198,7 @@ icl_pdu_free(struct icl_pdu *ip)
 void
 icl_soft_conn_pdu_free(struct icl_conn *ic, struct icl_pdu *ip)
 {
+
 	icl_pdu_free(ip);
 }
 
@@ -696,7 +694,7 @@ icl_conn_receive_pdu(struct icl_conn *ic
 	if (error != 0) {
 		/*
 		 * Don't free the PDU; it's pointed to by ic->ic_receive_pdu
-		 * and will get freed in icl_conn_close().
+		 * and will get freed in icl_soft_conn_close().
 		 */
 		icl_conn_fail(ic);
 	}
@@ -1248,7 +1246,7 @@ icl_conn_start(struct icl_conn *ic)
 	error = soreserve(ic->ic_socket, sendspace, recvspace);
 	if (error != 0) {
 		ICL_WARN("soreserve failed with error %d", error);
-		icl_conn_close(ic);
+		icl_soft_conn_close(ic);
 		return (error);
 	}
 	ic->ic_socket->so_snd.sb_flags |= SB_AUTOSIZE;
@@ -1266,7 +1264,7 @@ icl_conn_start(struct icl_conn *ic)
 	error = sosetopt(ic->ic_socket, &opt);
 	if (error != 0) {
 		ICL_WARN("disabling TCP_NODELAY failed with error %d", error);
-		icl_conn_close(ic);
+		icl_soft_conn_close(ic);
 		return (error);
 	}
 
@@ -1277,7 +1275,7 @@ icl_conn_start(struct icl_conn *ic)
 	    ic->ic_name);
 	if (error != 0) {
 		ICL_WARN("kthread_add(9) failed with error %d", error);
-		icl_conn_close(ic);
+		icl_soft_conn_close(ic);
 		return (error);
 	}
 
@@ -1285,7 +1283,7 @@ icl_conn_start(struct icl_conn *ic)
 	    ic->ic_name);
 	if (error != 0) {
 		ICL_WARN("kthread_add(9) failed with error %d", error);
-		icl_conn_close(ic);
+		icl_soft_conn_close(ic);
 		return (error);
 	}
 
@@ -1350,7 +1348,7 @@ icl_soft_conn_handoff(struct icl_conn *i
 }
 
 void
-icl_conn_close(struct icl_conn *ic)
+icl_soft_conn_close(struct icl_conn *ic)
 {
 	struct icl_pdu *pdu;
 
@@ -1419,13 +1417,6 @@ icl_conn_close(struct icl_conn *ic)
 	ICL_CONN_UNLOCK(ic);
 }
 
-void
-icl_soft_conn_close(struct icl_conn *ic)
-{
-
-	icl_conn_close(ic);
-}
-
 bool
 icl_soft_conn_connected(struct icl_conn *ic)
 {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502071415.t17EFIN3016951>