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

MFp4:

Browse Source 
Some more missed parts from previous commits.
This commit is contained in:
Alexander Motin 2009-11-14 20:30:42 +00:00
parent ec700f26b9
commit 1f1158b28d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=199281
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/cam/cam_periph.c
View File

@ -1465,6 +1465,11 @@ camperiphscsisenseerror(union ccb *ccb, cam_flags camflags,
action_string = "No recovery CCB supplied";
goto sense_error_done;
}
/*
* Clear freeze flag for original request here, as
* this freeze will be dropped as part of ERESTART.
*/
ccb->ccb_h.status &= ~CAM_DEV_QFRZN;
bcopy(ccb, save_ccb, sizeof(*save_ccb));
print_ccb = save_ccb;
periph->flags |= CAM_PERIPH_RECOVERY_INPROG;

1
sys/cam/cam_queue.c
View File

@ -334,7 +334,6 @@ cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
}
ccbq->devq_openings = openings;
ccbq->dev_openings = openings;
TAILQ_INIT(&ccbq->active_ccbs);
return (0);
}

7
sys/cam/cam_queue.h
View File

@ -60,7 +60,6 @@ struct cam_ccbq {
int dev_openings;
int dev_active;
int held;
struct ccb_hdr_tailq active_ccbs;
};
struct cam_ed;
@ -209,9 +208,6 @@ static __inline void
cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb)
{
TAILQ_INSERT_TAIL(&ccbq->active_ccbs,
&(send_ccb->ccb_h),
xpt_links.tqe);
send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX;
ccbq->dev_active++;
ccbq->dev_openings--;
@ -220,8 +216,7 @@ cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb)
static __inline void
cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb)
{
TAILQ_REMOVE(&ccbq->active_ccbs, &done_ccb->ccb_h,
xpt_links.tqe);
ccbq->dev_active--;
ccbq->dev_openings++;
ccbq->held++;