Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cc328f5 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent fff9d40c

drivers/scsi/ibmvscsi/ibmvfc.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

drivers/scsi/lpfc/lpfc_hbadisc.c

+0 −8
Original line number Diff line number Diff line
@@ -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;

}



/*

drivers/scsi/qla2xxx/qla_attr.c

+0 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,6 @@ qla2x00_terminate_rport_io(struct fc_rport *rport) 
	}



	qla2x00_abort_fcport_cmds(fcport);

	scsi_target_unblock(&rport->dev);

}



static int