Page MenuHomeFreeBSD
Files F150602171

D7985.id20558.diff
No OneTemporary
Actions

D7985.id20558.diff
View Options

Index: head/sys/cam/cam_xpt.c
===================================================================
--- head/sys/cam/cam_xpt.c
+++ head/sys/cam/cam_xpt.c
@@ -2578,21 +2578,25 @@
abort_ccb = start_ccb->cab.abort_ccb;
if (XPT_FC_IS_DEV_QUEUED(abort_ccb)) {
+ struct cam_ed *device;
+ struct cam_devq *devq;
- if (abort_ccb->ccb_h.pinfo.index >= 0) {
- struct cam_ccbq *ccbq;
- struct cam_ed *device;
-
- device = abort_ccb->ccb_h.path->device;
- ccbq = &device->ccbq;
- cam_ccbq_remove_ccb(ccbq, abort_ccb);
+ device = abort_ccb->ccb_h.path->device;
+ devq = device->sim->devq;
+
+ mtx_lock(&devq->send_mtx);
+ if (abort_ccb->ccb_h.pinfo.index > 0) {
+ cam_ccbq_remove_ccb(&device->ccbq, abort_ccb);
abort_ccb->ccb_h.status =
CAM_REQ_ABORTED|CAM_DEV_QFRZN;
- xpt_freeze_devq(abort_ccb->ccb_h.path, 1);
+ xpt_freeze_devq_device(device, 1);
+ mtx_unlock(&devq->send_mtx);
xpt_done(abort_ccb);
start_ccb->ccb_h.status = CAM_REQ_CMP;
break;
}
+ mtx_unlock(&devq->send_mtx);
+
if (abort_ccb->ccb_h.pinfo.index == CAM_UNQUEUED_INDEX
&& (abort_ccb->ccb_h.status & CAM_SIM_QUEUED) == 0) {
/*

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 5:44 PM (14 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30770771
Default Alt Text
D7985.id20558.diff (1 KB)

Event Timeline