Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Mike Christie and committed by
James Bottomley
9cc328f5 fff9d40c

-11
-2
drivers/scsi/ibmvscsi/ibmvfc.c
··· 2031 2031 spin_unlock_irqrestore(shost->host_lock, flags); 2032 2032 } else 2033 2033 ibmvfc_issue_fc_host_lip(shost); 2034 - 2035 - scsi_target_unblock(&rport->dev); 2036 2034 LEAVE; 2037 2035 } 2038 2036
-8
drivers/scsi/lpfc/lpfc_hbadisc.c
··· 88 88 &phba->sli.ring[phba->sli.fcp_ring], 89 89 ndlp->nlp_sid, 0, LPFC_CTX_TGT); 90 90 } 91 - 92 - /* 93 - * A device is normally blocked for rediscovery and unblocked when 94 - * devloss timeout happens. In case a vport is removed or driver 95 - * unloaded before devloss timeout happens, we need to unblock here. 96 - */ 97 - scsi_target_unblock(&rport->dev); 98 - return; 99 91 } 100 92 101 93 /*
-1
drivers/scsi/qla2xxx/qla_attr.c
··· 1006 1006 } 1007 1007 1008 1008 qla2x00_abort_fcport_cmds(fcport); 1009 - scsi_target_unblock(&rport->dev); 1010 1009 } 1011 1010 1012 1011 static int