From owner-svn-src-head@FreeBSD.ORG Fri Sep 28 12:13:35 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5215C1065680;
Fri, 28 Sep 2012 12:13:35 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3D4EC8FC0C;
Fri, 28 Sep 2012 12:13:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SCDZG1035733;
Fri, 28 Sep 2012 12:13:35 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8SCDZo6035731;
Fri, 28 Sep 2012 12:13:35 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201209281213.q8SCDZo6035731@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 28 Sep 2012 12:13:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r241028 - head/sys/cam
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Sep 2012 12:13:35 -0000
Author: mav
Date: Fri Sep 28 12:13:34 2012
New Revision: 241028
URL: http://svn.freebsd.org/changeset/base/241028
Log:
Change queue overflow checks from DIAGNOSTIC+panic() to KASSERT() to make
them enabled on HEAD by default. It is probably better to do single compare
then hunt for unexpected memory corruption.
Modified:
head/sys/cam/cam_queue.c
Modified: head/sys/cam/cam_queue.c
==============================================================================
--- head/sys/cam/cam_queue.c Fri Sep 28 11:59:32 2012 (r241027)
+++ head/sys/cam/cam_queue.c Fri Sep 28 12:13:34 2012 (r241028)
@@ -121,11 +121,9 @@ camq_resize(struct camq *queue, int new_
{
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 @@ camq_resize(struct camq *queue, int new_
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;