From owner-p4-projects@FreeBSD.ORG  Mon Jan 18 20:57:38 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B259B106568F; Mon, 18 Jan 2010 20:57:38 +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 76CE11065672
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 20:57:38 +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 659CE8FC16
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 20:57:38 +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 o0IKvcv1025855
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 20:57:38 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0IKvcwq025853
	for perforce@freebsd.org; Mon, 18 Jan 2010 20:57:38 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 18 Jan 2010 20:57:38 GMT
Message-Id: <201001182057.o0IKvcwq025853@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 173335 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: Mon, 18 Jan 2010 20:57:39 -0000

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

Change 173335 by mav@mav_mavtest on 2010/01/18 20:57:25

	Do not touch dev_openings when it should not be touched.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#8 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#8 (text+ko) ====

@@ -197,7 +197,6 @@
 	camq_insert(&ccbq->queue, &new_ccb->ccb_h.pinfo);
 	if (ccbq->queue.qfrozen_cnt[CAM_PRIORITY_TO_RL(
 	    new_ccb->ccb_h.pinfo.priority)] > 0) {
-		ccbq->dev_openings++;
 		ccbq->devq_openings++;
 		ccbq->held++;
 		return (1);
@@ -211,7 +210,6 @@
 	camq_remove(&ccbq->queue, ccb->ccb_h.pinfo.index);
 	if (ccbq->queue.qfrozen_cnt[CAM_PRIORITY_TO_RL(
 	    ccb->ccb_h.pinfo.priority)] > 0) {
-		ccbq->dev_openings--;
 		ccbq->devq_openings--;
 		ccbq->held--;
 		return (1);
@@ -273,7 +271,6 @@
 			continue;
 		if (rrl >= p)
 			break;
-		ccbq->dev_openings++;
 		ccbq->devq_openings++;
 		ccbq->held++;
 		frozen++;
@@ -304,7 +301,6 @@
 			continue;
 		if (rrl >= n)
 			break;
-		ccbq->dev_openings--;
 		ccbq->devq_openings--;
 		ccbq->held--;
 		released++;