asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IB/srp: Remove request from list when SCSI abort succeeds

Browse source 
If a SCSI abort succeeds, then the aborted request should to be
removed from the list of pending requests.  This fixes list corruption
after an abort occurs.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Roland Dreier 2006-04-19 11:40:10 -07:00
parent 0efd9323f3
commit f80887d0b9
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/infiniband/ulp/srp/ib_srp.c
View file

@ -617,6 +617,14 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
scmnd->sc_data_direction); scmnd->sc_data_direction);
} }
static void srp_remove_req(struct srp_target_port *target, struct srp_request *req,
int index)
{
list_del(&req->list);
req->next = target->req_head;
target->req_head = index;
}
static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp) static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
{ {
struct srp_request *req; struct srp_request *req;
@ -664,9 +672,7 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
scmnd->host_scribble = (void *) -1L; scmnd->host_scribble = (void *) -1L;
scmnd->scsi_done(scmnd); scmnd->scsi_done(scmnd);
list_del(&req->list); srp_remove_req(target, req, rsp->tag & ~SRP_TAG_TSK_MGMT);
req->next = target->req_head;
target->req_head = rsp->tag & ~SRP_TAG_TSK_MGMT;
} else } else
req->cmd_done = 1; req->cmd_done = 1;
} }
@ -1188,12 +1194,10 @@ static int srp_send_tsk_mgmt(struct scsi_cmnd *scmnd, u8 func)
spin_lock_irq(target->scsi_host->host_lock); spin_lock_irq(target->scsi_host->host_lock);
if (req->cmd_done) { if (req->cmd_done) {
list_del(&req->list); srp_remove_req(target, req, req_index);
req->next = target->req_head;
target->req_head = req_index;
scmnd->scsi_done(scmnd); scmnd->scsi_done(scmnd);
} else if (!req->tsk_status) { } else if (!req->tsk_status) {
srp_remove_req(target, req, req_index);
scmnd->result = DID_ABORT << 16; scmnd->result = DID_ABORT << 16;
ret = SUCCESS; ret = SUCCESS;
} }