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

Commit 8f0722ca authored May 17, 2011 by Vikas Chaudhary Committed by James Bottomley May 24, 2011

[SCSI] qla4xxx: Remove host_lock in queuecommand function



Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <jbottomley@parallels.com>

parent 1b46807e

drivers/scsi/qla4xxx/ql4_os.c

+7 −19

Original line number	Original line	Diff line number	Diff line
	@@ -412,8 +412,7 @@ void qla4xxx_mark_all_devices_missing(struct scsi_qla_host *ha)

	static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha,		static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha,
	struct ddb_entry *ddb_entry,		struct ddb_entry *ddb_entry,
	struct scsi_cmnd *cmd,		struct scsi_cmnd *cmd)
	void (done)(struct scsi_cmnd ))
	{		{
	struct srb *srb;		struct srb *srb;

	@@ -427,7 +426,6 @@ static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha,
	srb->cmd = cmd;		srb->cmd = cmd;
	srb->flags = 0;		srb->flags = 0;
	CMD_SP(cmd) = (void *)srb;		CMD_SP(cmd) = (void *)srb;
	cmd->scsi_done = done;

	return srb;		return srb;
	}		}
	@@ -458,9 +456,8 @@ void qla4xxx_srb_compl(struct kref *ref)

	/**		/**
	* qla4xxx_queuecommand - scsi layer issues scsi command to driver.		* qla4xxx_queuecommand - scsi layer issues scsi command to driver.
			* @host: scsi host
	* @cmd: Pointer to Linux's SCSI command structure		* @cmd: Pointer to Linux's SCSI command structure
	* @done_fn: Function that the driver calls to notify the SCSI mid-layer
	* that the command has been processed.
	*		*
	* Remarks:		* Remarks:
	* This routine is invoked by Linux to send a SCSI command to the driver.		* This routine is invoked by Linux to send a SCSI command to the driver.
	@@ -470,10 +467,9 @@ void qla4xxx_srb_compl(struct kref *ref)
	* completion handling). Unfortunely, it sometimes calls the scheduler		* completion handling). Unfortunely, it sometimes calls the scheduler
	* in interrupt context which is a big NO! NO!.		* in interrupt context which is a big NO! NO!.
	**/		**/
	static int qla4xxx_queuecommand_lck(struct scsi_cmnd *cmd,		static int qla4xxx_queuecommand(struct Scsi_Host host, struct scsi_cmnd cmd)
	void (done)(struct scsi_cmnd ))
	{		{
	struct scsi_qla_host *ha = to_qla_host(cmd->device->host);		struct scsi_qla_host *ha = to_qla_host(host);
	struct ddb_entry *ddb_entry = cmd->device->hostdata;		struct ddb_entry *ddb_entry = cmd->device->hostdata;
	struct iscsi_cls_session *sess = ddb_entry->sess;		struct iscsi_cls_session *sess = ddb_entry->sess;
	struct srb *srb;		struct srb *srb;
	@@ -515,37 +511,29 @@ static int qla4xxx_queuecommand_lck(struct scsi_cmnd *cmd,
	test_bit(DPC_RESET_HA_FW_CONTEXT, &ha->dpc_flags))		test_bit(DPC_RESET_HA_FW_CONTEXT, &ha->dpc_flags))
	goto qc_host_busy;		goto qc_host_busy;

	spin_unlock_irq(ha->host->host_lock);		srb = qla4xxx_get_new_srb(ha, ddb_entry, cmd);

	srb = qla4xxx_get_new_srb(ha, ddb_entry, cmd, done);
	if (!srb)		if (!srb)
	goto qc_host_busy_lock;		goto qc_host_busy;

	rval = qla4xxx_send_command_to_isp(ha, srb);		rval = qla4xxx_send_command_to_isp(ha, srb);
	if (rval != QLA_SUCCESS)		if (rval != QLA_SUCCESS)
	goto qc_host_busy_free_sp;		goto qc_host_busy_free_sp;

	spin_lock_irq(ha->host->host_lock);
	return 0;		return 0;

	qc_host_busy_free_sp:		qc_host_busy_free_sp:
	qla4xxx_srb_free_dma(ha, srb);		qla4xxx_srb_free_dma(ha, srb);
	mempool_free(srb, ha->srb_mempool);		mempool_free(srb, ha->srb_mempool);

	qc_host_busy_lock:
	spin_lock_irq(ha->host->host_lock);

	qc_host_busy:		qc_host_busy:
	return SCSI_MLQUEUE_HOST_BUSY;		return SCSI_MLQUEUE_HOST_BUSY;

	qc_fail_command:		qc_fail_command:
	done(cmd);		cmd->scsi_done(cmd);

	return 0;		return 0;
	}		}

	static DEF_SCSI_QCMD(qla4xxx_queuecommand)

	/**		/**
	* qla4xxx_mem_free - frees memory allocated to adapter		* qla4xxx_mem_free - frees memory allocated to adapter
	* @ha: Pointer to host adapter structure.		* @ha: Pointer to host adapter structure.