From: Mike Christie <michaelc@xxxxxxxxxxx> The fc class now calls scsi_target_unblock after calling the terminate callback, so this patch removes the calls from the drivers. This patch was made over scsi-misc which has the ibmvfc driver. It is also made over the latest qlogic patchset, which added a terminate callback patchset: http://marc.info/?l=linux-scsi&m=121573412422984&w=2 patch with callabck addition http://marc.info/?l=linux-scsi&m=121573444523292&w=2 Signed-off-by: Mike Christie <michaelc@xxxxxxxxxxx> --- drivers/scsi/ibmvscsi/ibmvfc.c | 2 -- drivers/scsi/lpfc/lpfc_hbadisc.c | 8 -------- drivers/scsi/qla2xxx/qla_attr.c | 1 - 3 files changed, 0 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index eb702b9..f5a6982 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -2001,8 +2001,6 @@ static void ibmvfc_terminate_rport_io(struct fc_rport *rport) spin_unlock_irqrestore(shost->host_lock, flags); } else ibmvfc_issue_fc_host_lip(shost); - - scsi_target_unblock(&rport->dev); LEAVE; } diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index a98d11b..aaf398e 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -88,14 +88,6 @@ lpfc_terminate_rport_io(struct fc_rport *rport) &phba->sli.ring[phba->sli.fcp_ring], ndlp->nlp_sid, 0, LPFC_CTX_TGT); } - - /* - * A device is normally blocked for rediscovery and unblocked when - * devloss timeout happens. In case a vport is removed or driver - * unloaded before devloss timeout happens, we need to unblock here. - */ - scsi_target_unblock(&rport->dev); - return; } /* diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 612e3d0..95fc562 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -1019,7 +1019,6 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) fc_port_t *fcport = *(fc_port_t **)rport->dd_data; qla2x00_abort_fcport_cmds(fcport); - scsi_target_unblock(&rport->dev); } static int -- 1.5.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
