diff options
author | mav <mav@FreeBSD.org> | 2012-09-28 12:13:34 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2012-09-28 12:13:34 +0000 |
commit | 06f4d9dad6ab82fd1a15f853500073b91c40496a (patch) | |
tree | 8c7f9aadab47e5e571b3b79c18d3c9df9d3d44f2 /sys/cam | |
parent | f643d4c50acbb3d6c4a9aa07dc0ae5c1c5e1e1ac (diff) | |
download | FreeBSD-src-06f4d9dad6ab82fd1a15f853500073b91c40496a.zip FreeBSD-src-06f4d9dad6ab82fd1a15f853500073b91c40496a.tar.gz |
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.
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/cam_queue.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c index d6d953d..3f4ffec 100644 --- a/sys/cam/cam_queue.c +++ b/sys/cam/cam_queue.c @@ -121,11 +121,9 @@ camq_resize(struct camq *queue, int new_size) { 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_size) 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; |