PERFORCE change 173575 for review

[Alexander Motin]

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

Change 173575 by mav at 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) {
 		/*