On 12.06.2013 15:23, Bart Van Assche wrote: > The SCSI error handler assumes that the transport layer is > operational if an eh_abort_handler() returns SUCCESS. Hence let > srp_abort() only return SUCCESS if sending the ABORT TASK task > management function succeeded. This patch avoids that the SCSI > error handler skips the srp_reset_host() call after a transport > layer error. > > Signed-off-by: Bart Van Assche <[email protected]> > Cc: Roland Dreier <[email protected]> > Cc: David Dillow <[email protected]> > Cc: Vu Pham <[email protected]> > Cc: Sebastian Riemer <[email protected]> > --- > drivers/infiniband/ulp/srp/ib_srp.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/infiniband/ulp/srp/ib_srp.c > b/drivers/infiniband/ulp/srp/ib_srp.c > index 9c638dd..fb37b47 100644 > --- a/drivers/infiniband/ulp/srp/ib_srp.c > +++ b/drivers/infiniband/ulp/srp/ib_srp.c > @@ -1742,18 +1742,23 @@ static int srp_abort(struct scsi_cmnd *scmnd) > { > struct srp_target_port *target = host_to_target(scmnd->device->host); > struct srp_request *req = (struct srp_request *) scmnd->host_scribble; > + int ret; > > shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n"); > > if (!req || !srp_claim_req(target, req, scmnd)) > return FAILED; > - srp_send_tsk_mgmt(target, req->index, scmnd->device->lun, > - SRP_TSK_ABORT_TASK); > + if (srp_send_tsk_mgmt(target, req->index, scmnd->device->lun, > + SRP_TSK_ABORT_TASK) == 0 || > + target->transport_offline) > + ret = SUCCESS;
Here you try to hide a little trick. Returning success upon (target->transport_offline == true) is perhaps not the best way. I guess you try to fail IO fast here but up to this point "target->transport_offline = true" is only set in srp_reset_host(). Please explain for what you need that in this patch! Furthermore, returning "FAST_IO_FAIL" sounds better to me in this situation. > + else > + ret = FAILED; > srp_free_req(target, req, scmnd, 0); > scmnd->result = DID_ABORT << 16; > scmnd->scsi_done(scmnd); > > - return SUCCESS; > + return ret; > } > > static int srp_reset_device(struct scsi_cmnd *scmnd) > The rest is okay. Cheers, Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
