From owner-svn-src-projects@FreeBSD.ORG  Fri May  4 17:12:31 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 BC1221065675;
	Fri,  4 May 2012 17:12:31 +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 A7B718FC08;
	Fri,  4 May 2012 17:12:31 +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 q44HCV8d014105;
	Fri, 4 May 2012 17:12:31 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q44HCVE1014103;
	Fri, 4 May 2012 17:12:31 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201205041712.q44HCVE1014103@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 4 May 2012 17:12:31 +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: r235020 - 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 17:12:31 -0000

Author: kmacy
Date: Fri May  4 17:12:31 2012
New Revision: 235020
URL: http://svn.freebsd.org/changeset/base/235020

Log:
  check that the queue wasn't already frozen while we didn't hold the lock

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

Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c
==============================================================================
--- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c	Fri May  4 17:02:34 2012	(r235019)
+++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c	Fri May  4 17:12:31 2012	(r235020)
@@ -251,18 +251,16 @@ ic_action(struct cam_sim *sim, union ccb
 
 	  if (rc == EWOULDBLOCK) {
 		  if ((sp->cam_flags & ISC_QFROZEN) == 0) {
-			  int freeze_count = xpt_freeze_simq(sim, 1);
-			  sp->cam_flags |= ISC_QFROZEN;
 			  CAM_UNLOCK(sp);
 			  SOCKBUF_LOCK(&sp->soc->so_snd);
 			  CAM_LOCK(sp);
-			  if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] != freeze_count) {
-			    printf("lost race when acquiring socket buffer lock qfrozen_cnt=%d freeze_count=%d\n", sp->cam_sim->devq->send_queue.qfrozen_cnt[0], freeze_count);
-				  sp->cam_sim->devq->send_queue.qfrozen_cnt[0] = freeze_count;
+			  if ((sp->cam_flags & ISC_QFROZEN) == 0) {
+				  sp->cam_flags |= ISC_QFROZEN;
+				  xpt_freeze_simq(sim, 1);			  
+				  soupcall_set(sp->soc, SO_SND, isc_so_snd_upcall, sp);
 			  }
-			  soupcall_set(sp->soc, SO_SND, isc_so_snd_upcall, sp);
+			  /* else we lost the race and someone else froze it for us oh well */
 			  SOCKBUF_UNLOCK(&sp->soc->so_snd);
-
 		  }
 		  status = ccb->ccb_h.status &= ~CAM_STATUS_MASK;
 		  csio->ccb_h.status = status | CAM_REQUEUE_REQ;