d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some more pieces of multilevel freeze mechanism, missed in r249466.

Browse Source
This commit is contained in:
Alexander Motin 2013-04-14 18:09:08 +00:00
parent db8f33fd32
commit 1268d4813e
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/cam/cam_queue.h
View File

@ -155,10 +155,10 @@ cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq);
static __inline void static __inline void
cam_ccbq_take_opening(struct cam_ccbq *ccbq); 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); 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); cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb);
static __inline union ccb * static __inline union ccb *
@ -187,29 +187,17 @@ cam_ccbq_take_opening(struct cam_ccbq *ccbq)
ccbq->held++; ccbq->held++;
} }
static __inline int static __inline void
cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb) cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb)
{ {
ccbq->held--; ccbq->held--;
camq_insert(&ccbq->queue, &new_ccb->ccb_h.pinfo); 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) cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb)
{ {
camq_remove(&ccbq->queue, ccb->ccb_h.pinfo.index); 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 * static __inline union ccb *