[Midnightbsd-cvs] src [8240] trunk/sys/cam/cam_queue.c: change queue overflow checks

[laffer1 at midnightbsd.org]

Revision: 8240
          http://svnweb.midnightbsd.org/src/?rev=8240
Author:   laffer1
Date:     2016-09-17 17:31:18 -0400 (Sat, 17 Sep 2016)
Log Message:
-----------
change queue overflow checks

Modified Paths:
--------------
    trunk/sys/cam/cam_queue.c

Modified: trunk/sys/cam/cam_queue.c
===================================================================
--- trunk/sys/cam/cam_queue.c	2016-09-17 21:30:51 UTC (rev 8239)
+++ trunk/sys/cam/cam_queue.c	2016-09-17 21:31:18 UTC (rev 8240)
@@ -121,11 +121,9 @@
 {
 	cam_pinfo **new_array;
 
-#ifdef DIAGNOSTIC
-	if (new_size < queue->entries)
-		panic("camq_resize: New queue size can't accomodate "
-		      "queued entries.");
-#endif
+	KASSERT(new_size >= queue->entries, ("camq_resize: "
+	    "New queue size can't accomodate queued entries (%d < %d).",
+	    new_size, queue->entries));
 	new_array = (cam_pinfo **)malloc(new_size * sizeof(cam_pinfo *),
 					 M_CAMQ, M_NOWAIT);
 	if (new_array == NULL) {
@@ -156,10 +154,10 @@
 void
 camq_insert(struct camq *queue, cam_pinfo *new_entry)
 {
-#ifdef DIAGNOSTIC
-	if (queue->entries >= queue->array_size)
-		panic("camq_insert: Attempt to insert into a full queue");
-#endif
+
+	KASSERT(queue->entries < queue->array_size,
+	    ("camq_insert: Attempt to insert into a full queue (%d >= %d)",
+	    queue->entries, queue->array_size));
 	queue->entries++;
 	queue->queue_array[queue->entries] = new_entry;
 	new_entry->index = queue->entries;