summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/cam_queue.c9
-rw-r--r--sys/cam/cam_queue.h2
-rw-r--r--sys/cam/cam_xpt.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 1e756d2..56586be 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -289,7 +289,7 @@ void
cam_ccbq_free(struct cam_ccbq *ccbq)
{
if (ccbq) {
- camq_fini(&ccbq->queue);
+ cam_ccbq_fini(ccbq);
free(ccbq, M_CAMCCBQ);
}
}
@@ -338,6 +338,13 @@ cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
return (0);
}
+void
+cam_ccbq_fini(struct cam_ccbq *ccbq)
+{
+
+ camq_fini(&ccbq->queue);
+}
+
/*
* Heap routines for manipulating CAM queues.
*/
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index f3295f3..d2990ad 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -96,6 +96,8 @@ int cam_ccbq_init(struct cam_ccbq *ccbq, int openings);
void cam_ccbq_free(struct cam_ccbq *ccbq);
+void cam_ccbq_fini(struct cam_ccbq *ccbq);
+
/*
* Allocate and initialize a cam_queue structure.
*/
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 9afeafa..5ca0584 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -4447,7 +4447,7 @@ xpt_release_device(struct cam_eb *bus, struct cam_et *target,
devq = bus->sim->devq;
cam_devq_resize(devq, devq->alloc_queue.array_size - 1);
camq_fini(&device->drvq);
- camq_fini(&device->ccbq.queue);
+ cam_ccbq_fini(&device->ccbq);
free(device, M_CAMXPT);
xpt_release_target(bus, target);
}
OpenPOWER on IntegriCloud