[SCSI] ibmvfc, qla2xxx, lpfc: remove scsi_target_unblock calls in terminate callbacks

The fc class now calls scsi_target_unblock after calling the
terminate callback, so this patch removes the calls from the
drivers.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 4e0b7c8eb32e731a535b9d2110af3b52f494d78b..7650707a40defc4f7a032a4972cad4afabd99af9 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -2031,8 +2031,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 a98d11bf35767dbf5e3b6df9b8b5bc483616a597..aaf398e5c93f9317ee62ea569bee0bc7b0853240 100644 (file)
--- 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 0ddfe7106b3bd1cc270849d76e2d7b8a9071e296..ed731968f15fd2680af6bf66bb110bdb4e71f0bf 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -1006,7 +1006,6 @@ qla2x00_terminate_rport_io(struct fc_rport *rport)
        }
 
        qla2x00_abort_fcport_cmds(fcport);
-       scsi_target_unblock(&rport->dev);
 }
 
 static int