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

Commit 6138ed2a authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Nicholas Bellinger
Browse files

target: move transport_get_sense_data 



We will be calling it from transport_complete_cmd, avoid forward
declarations.  No semantic change.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 13b5533a

drivers/target/target_core_transport.c

+55 −55
Original line number Original line Diff line number Diff line
@@ -567,6 +567,61 @@ static void target_complete_failure_work(struct work_struct *work) 
	transport_generic_request_failure(cmd);

	transport_generic_request_failure(cmd);

}

}





/*

 * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd

 */

static int transport_get_sense_data(struct se_cmd *cmd)

{

	unsigned char *buffer = cmd->sense_buffer, *sense_buffer = NULL;

	struct se_device *dev = cmd->se_dev;

	unsigned long flags;

	u32 offset = 0;



	WARN_ON(!cmd->se_lun);



	if (!dev)

		return 0;



	spin_lock_irqsave(&cmd->t_state_lock, flags);

	if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {

		spin_unlock_irqrestore(&cmd->t_state_lock, flags);

		return 0;

	}



	if (!(cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE))

		goto out;



	if (!dev->transport->get_sense_buffer) {

		pr_err("dev->transport->get_sense_buffer is NULL\n");

		goto out;

	}



	sense_buffer = dev->transport->get_sense_buffer(cmd);

	if (!sense_buffer) {

		pr_err("ITT 0x%08x cmd %p: Unable to locate"

			" sense buffer for task with sense\n",

			cmd->se_tfo->get_task_tag(cmd), cmd);

		goto out;

	}



	spin_unlock_irqrestore(&cmd->t_state_lock, flags);



	offset = cmd->se_tfo->set_fabric_sense_len(cmd, TRANSPORT_SENSE_BUFFER);



	memcpy(&buffer[offset], sense_buffer, TRANSPORT_SENSE_BUFFER);



	/* Automatically padded */

	cmd->scsi_sense_length = TRANSPORT_SENSE_BUFFER + offset;



	pr_debug("HBA_[%u]_PLUG[%s]: Set SAM STATUS: 0x%02x and sense\n",

		dev->se_hba->hba_id, dev->transport->name, cmd->scsi_status);

	return 0;



out:

	spin_unlock_irqrestore(&cmd->t_state_lock, flags);

	return -1;

}



void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)

void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)

{

{

	struct se_device *dev = cmd->se_dev;

	struct se_device *dev = cmd->se_dev;
@@ -1820,61 +1875,6 @@ void target_execute_cmd(struct se_cmd *cmd) 
}

}

EXPORT_SYMBOL(target_execute_cmd);

EXPORT_SYMBOL(target_execute_cmd);





/*

 * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd

 */

static int transport_get_sense_data(struct se_cmd *cmd)

{

	unsigned char *buffer = cmd->sense_buffer, *sense_buffer = NULL;

	struct se_device *dev = cmd->se_dev;

	unsigned long flags;

	u32 offset = 0;



	WARN_ON(!cmd->se_lun);



	if (!dev)

		return 0;



	spin_lock_irqsave(&cmd->t_state_lock, flags);

	if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION) {

		spin_unlock_irqrestore(&cmd->t_state_lock, flags);

		return 0;

	}



	if (!(cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE))

		goto out;



	if (!dev->transport->get_sense_buffer) {

		pr_err("dev->transport->get_sense_buffer is NULL\n");

		goto out;

	}



	sense_buffer = dev->transport->get_sense_buffer(cmd);

	if (!sense_buffer) {

		pr_err("ITT 0x%08x cmd %p: Unable to locate"

			" sense buffer for task with sense\n",

			cmd->se_tfo->get_task_tag(cmd), cmd);

		goto out;

	}



	spin_unlock_irqrestore(&cmd->t_state_lock, flags);



	offset = cmd->se_tfo->set_fabric_sense_len(cmd, TRANSPORT_SENSE_BUFFER);



	memcpy(&buffer[offset], sense_buffer, TRANSPORT_SENSE_BUFFER);



	/* Automatically padded */

	cmd->scsi_sense_length = TRANSPORT_SENSE_BUFFER + offset;



	pr_debug("HBA_[%u]_PLUG[%s]: Set SAM STATUS: 0x%02x and sense\n",

		dev->se_hba->hba_id, dev->transport->name, cmd->scsi_status);

	return 0;



out:

	spin_unlock_irqrestore(&cmd->t_state_lock, flags);

	return -1;

}



/*

/*

 * Process all commands up to the last received ORDERED task attribute which

 * Process all commands up to the last received ORDERED task attribute which

 * requires another blocking boundary

 * requires another blocking boundary