Page MenuHomeFreeBSD
Files F177536709

D8151.1794657446.diff
No OneTemporary
Actions

Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None

D8151.1794657446.diff
View Options

Index: head/sys/cam/cam_queue.h
===================================================================
--- head/sys/cam/cam_queue.h
+++ head/sys/cam/cam_queue.h
@@ -197,6 +197,11 @@
struct ccb_hdr *old_ccb;
struct camq *queue = &ccbq->queue;
+ KASSERT((new_ccb->ccb_h.func_code & XPT_FC_QUEUED) != 0 &&
+ (new_ccb->ccb_h.func_code & XPT_FC_USER_CCB) == 0,
+ ("%s: Cannot queue ccb %p func_code %#x", __func__, new_ccb,
+ new_ccb->ccb_h.func_code));
+
/*
* If queue is already full, try to resize.
* If resize fail, push CCB with lowest priority out to the TAILQ.
@@ -218,6 +223,7 @@
{
struct ccb_hdr *cccb, *bccb;
struct camq *queue = &ccbq->queue;
+ cam_pinfo *removed_entry __unused;
/* If the CCB is on the TAILQ, remove it from there. */
if (ccb->ccb_h.pinfo.index == CAM_EXTRAQ_INDEX) {
@@ -228,7 +234,10 @@
return;
}
- camq_remove(queue, ccb->ccb_h.pinfo.index);
+ removed_entry = camq_remove(queue, ccb->ccb_h.pinfo.index);
+ KASSERT(removed_entry == &ccb->ccb_h.pinfo,
+ ("%s: Removed wrong entry from queue (%p != %p)", __func__,
+ removed_entry, &ccb->ccb_h.pinfo));
/*
* If there are some CCBs on TAILQ, find the best one and move it
Index: head/sys/cam/cam_queue.c
===================================================================
--- head/sys/cam/cam_queue.c
+++ head/sys/cam/cam_queue.c
@@ -176,8 +176,11 @@
{
cam_pinfo *removed_entry;
- if (index == 0 || index > queue->entries)
- return (NULL);
+ if (index <= 0 || index > queue->entries)
+ panic("%s: Attempt to remove out-of-bounds index %d "
+ "from queue %p of size %d", __func__, index, queue,
+ queue->entries);
+
removed_entry = queue->queue_array[index];
if (queue->entries != index) {
queue->queue_array[index] = queue->queue_array[queue->entries];

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 14, 11:57 AM (2 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41722882
Default Alt Text
D8151.1794657446.diff (1 KB)

Event Timeline