From owner-p4-projects@FreeBSD.ORG  Wed Nov 11 19:59:58 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 842271065698; Wed, 11 Nov 2009 19:59:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48E5E106568F
	for <perforce@freebsd.org>; Wed, 11 Nov 2009 19:59:58 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 36B4A8FC16
	for <perforce@freebsd.org>; Wed, 11 Nov 2009 19:59:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABJxvPH015883
	for <perforce@freebsd.org>; Wed, 11 Nov 2009 19:59:57 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABJxvMV015881
	for perforce@freebsd.org; Wed, 11 Nov 2009 19:59:57 GMT
	(envelope-from mav@freebsd.org)
Date: Wed, 11 Nov 2009 19:59:57 GMT
Message-Id: <200911111959.nABJxvMV015881@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 170504 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2009 19:59:58 -0000

http://p4web.freebsd.org/chv.cgi?CH=170504

Change 170504 by mav@mav_mavbook on 2009/11/11 19:59:13

	Unify code a bit.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 (text+ko) ====

@@ -3273,16 +3273,13 @@
 
 	devq->send_queue.qfrozen_cnt++;
 	while ((devq->send_queue.entries > 0)
-	    && (devq->send_openings > 0)) {
+	    && (devq->send_openings > 0)
+	    && (devq->send_queue.qfrozen_cnt <= 1)) {
 		struct	cam_ed_qinfo *qinfo;
 		struct	cam_ed *device;
 		union ccb *work_ccb;
 		struct	cam_sim *sim;
 
-	    	if (devq->send_queue.qfrozen_cnt > 1) {
-			break;
-		}
-
 		qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue,
 							   CAMQ_HEAD);
 		device = qinfo->device;