From owner-p4-projects@FreeBSD.ORG  Sat Jan 23 12:21:54 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E12B71065692; Sat, 23 Jan 2010 12:21:53 +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 A5C9B106568D
	for <perforce@freebsd.org>; Sat, 23 Jan 2010 12:21:53 +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 930BD8FC1D
	for <perforce@freebsd.org>; Sat, 23 Jan 2010 12:21:53 +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 o0NCLqIw042151
	for <perforce@freebsd.org>; Sat, 23 Jan 2010 12:21:52 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0NCLqxJ042149
	for perforce@freebsd.org; Sat, 23 Jan 2010 12:21:52 GMT
	(envelope-from mav@freebsd.org)
Date: Sat, 23 Jan 2010 12:21:52 GMT
Message-Id: <201001231221.o0NCLqxJ042149@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 173575 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: Sat, 23 Jan 2010 12:21:54 -0000

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

Change 173575 by mav@mav_mavtest on 2010/01/23 12:21:11

	Turn KASSERTs into printfs. It is not so bad to crash system there.

Affected files ...

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

Differences ...

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

@@ -4187,10 +4187,11 @@
 xpt_release_devq_device(struct cam_ed *dev, cam_rl rl, u_int count, int run_queue)
 {
 
-	KASSERT(count <= dev->ccbq.queue.qfrozen_cnt[rl],
-	    ("xpt_release_devq: requested %u > present %u\n",
-	    count, dev->ccbq.queue.qfrozen_cnt[rl]));
-	count = min(count, dev->ccbq.queue.qfrozen_cnt[rl]);
+	if (count > dev->ccbq.queue.qfrozen_cnt[rl]) {
+		printf("xpt_release_devq(%d): requested %u > present %u\n",
+		    rl, count, dev->ccbq.queue.qfrozen_cnt[rl]);
+		count = dev->ccbq.queue.qfrozen_cnt[rl];
+	}
 	dev->sim->devq->alloc_openings -=
 	    cam_ccbq_release(&dev->ccbq, rl, count);
 	if (cam_ccbq_frozen(&dev->ccbq, CAM_PRIORITY_TO_RL(
@@ -4231,10 +4232,10 @@
 
 	mtx_assert(sim->mtx, MA_OWNED);
 	sendq = &(sim->devq->send_queue);
-	KASSERT(sendq->qfrozen_cnt[0] > 0,
-	    ("xpt_release_simq: requested 1 > present %u\n",
-	    sendq->qfrozen_cnt[0]));
-	if (sendq->qfrozen_cnt[0] > 0)
+	if (sendq->qfrozen_cnt[0] <= 0) {
+		printf("xpt_release_simq: requested 1 > present %u\n",
+		    sendq->qfrozen_cnt[0]);
+	} else
 		sendq->qfrozen_cnt[0]--;
 	if (sendq->qfrozen_cnt[0] == 0) {
 		/*