From owner-svn-src-projects@FreeBSD.ORG  Fri May  4 18:32:18 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 415E61065670;
	Fri,  4 May 2012 18:32:18 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D1368FC1A;
	Fri,  4 May 2012 18:32:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q44IWIac017347;
	Fri, 4 May 2012 18:32:18 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q44IWH6D017345;
	Fri, 4 May 2012 18:32:17 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201205041832.q44IWH6D017345@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 4 May 2012 18:32:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235027 - projects/iscsi_opt/sys/dev/iscsi/initiator
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 May 2012 18:32:18 -0000

Author: kmacy
Date: Fri May  4 18:32:17 2012
New Revision: 235027
URL: http://svn.freebsd.org/changeset/base/235027

Log:
  always schedule a release from the socket callout

Modified:
  projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c

Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c
==============================================================================
--- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c	Fri May  4 18:30:40 2012	(r235026)
+++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c	Fri May  4 18:32:17 2012	(r235027)
@@ -362,7 +362,7 @@ isc_so_snd_upcall(struct socket *so, voi
 	soupcall_clear(so, SO_SND);
 	sp->space_needed = 0;
 
-	mtx_lock(sp->cam_sim->mtx);
+	CAM_LOCK(sp);
 
 	if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] != 1) {
 
@@ -371,17 +371,13 @@ isc_so_snd_upcall(struct socket *so, voi
 			printf("qfrozen_cnt went to bad value %d\n",
 			    sp->cam_sim->devq->send_queue.qfrozen_cnt[0]);
 	}
-	if (sp->cam_flags & ISC_QFROZEN) {
-		sp->cam_flags |= ISC_QUNFREEZE;
-
-		mtx_lock(&sp->io_mtx);
-		if (sp->flags & ISC_OWAITING)
-			wakeup(&sp->flags);
-		mtx_unlock(&sp->io_mtx);
-	} else
-		printf("queue already released !!! %d\n",
-		    sp->cam_sim->devq->send_queue.qfrozen_cnt[0]);
-	mtx_unlock(sp->cam_sim->mtx);
+	sp->cam_flags |= ISC_QUNFREEZE;
+	
+	mtx_lock(&sp->io_mtx);
+	if (sp->flags & ISC_OWAITING)
+	  wakeup(&sp->flags);
+	mtx_unlock(&sp->io_mtx);
+	CAM_UNLOCK(sp);
 
 	return (SU_OK);
 }