summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2013-04-14 18:09:08 +0000
committermav <mav@FreeBSD.org>2013-04-14 18:09:08 +0000
commitce96561fb66023bd3002e88a4d5ae121660b13cb (patch)
treeaefcb613103a06b65b73fabd9cf69e15e6b4c499 /sys/cam
parent1798a915c42b5d2350b14301401678655b36dc60 (diff)
downloadFreeBSD-src-ce96561fb66023bd3002e88a4d5ae121660b13cb.zip
FreeBSD-src-ce96561fb66023bd3002e88a4d5ae121660b13cb.tar.gz
Remove some more pieces of multilevel freeze mechanism, missed in r249466.
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/cam_queue.h20
1 files changed, 4 insertions, 16 deletions
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index a000fe4..9b27bae 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -155,10 +155,10 @@ cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq);
static __inline void
cam_ccbq_take_opening(struct cam_ccbq *ccbq);
-static __inline int
+static __inline void
cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb);
-static __inline int
+static __inline void
cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb);
static __inline union ccb *
@@ -187,29 +187,17 @@ cam_ccbq_take_opening(struct cam_ccbq *ccbq)
ccbq->held++;
}
-static __inline int
+static __inline void
cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb)
{
ccbq->held--;
camq_insert(&ccbq->queue, &new_ccb->ccb_h.pinfo);
- if (ccbq->queue.qfrozen_cnt > 0) {
- ccbq->devq_openings++;
- ccbq->held++;
- return (1);
- } else
- return (0);
}
-static __inline int
+static __inline void
cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb)
{
camq_remove(&ccbq->queue, ccb->ccb_h.pinfo.index);
- if (ccbq->queue.qfrozen_cnt > 0) {
- ccbq->devq_openings--;
- ccbq->held--;
- return (1);
- } else
- return (0);
}
static __inline union ccb *
OpenPOWER on IntegriCloud