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

Commit b9a7c631 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.33: Convert to no SCSI host lock in queuecommand 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b84daac9

drivers/scsi/lpfc/lpfc_scsi.c

+2 −7
Original line number Diff line number Diff line
@@ -4241,9 +4241,8 @@ void lpfc_poll_timeout(unsigned long ptr) 
 *   SCSI_MLQUEUE_HOST_BUSY - Block all devices served by this host temporarily.

 **/

static int

lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))

lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)

{

	struct Scsi_Host  *shost = cmnd->device->host;

	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;

	struct lpfc_hba   *phba = vport->phba;

	struct lpfc_rport_data *rdata = cmnd->device->hostdata;
@@ -4299,7 +4298,6 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) 
	lpfc_cmd->timeout = 0;

	lpfc_cmd->start_time = jiffies;

	cmnd->host_scribble = (unsigned char *)lpfc_cmd;

	cmnd->scsi_done = done;



	if (scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) {

		if (vport->phba->cfg_enable_bg) {
@@ -4363,11 +4361,9 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) 
		goto out_host_busy_free_buf;

	}

	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {

		spin_unlock(shost->host_lock);

		lpfc_sli_handle_fast_ring_event(phba,

			&phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ);



		spin_lock(shost->host_lock);

		if (phba->cfg_poll & DISABLE_FCP_RING_INT)

			lpfc_poll_rearm_timer(phba);

	}
@@ -4384,11 +4380,10 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) 
	return SCSI_MLQUEUE_TARGET_BUSY;



 out_fail_command:

	done(cmnd);

	cmnd->scsi_done(cmnd);

	return 0;

}



static DEF_SCSI_QCMD(lpfc_queuecommand)



/**

 * lpfc_abort_handler - scsi_host_template eh_abort_handler entry point