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

Commit 89a104ed authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: target: Do not duplicate the code that marks that a command has sense data 



This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarMike Christie <mchristi@redhat.com>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 799d44d0

drivers/target/target_core_transport.c

+3 −6
Original line number Diff line number Diff line
@@ -2121,9 +2121,6 @@ static void transport_complete_qf(struct se_cmd *cmd) 
		if (cmd->scsi_status)

			goto queue_status;



		cmd->se_cmd_flags |= SCF_EMULATED_TASK_SENSE;

		cmd->scsi_status = SAM_STAT_CHECK_CONDITION;

		cmd->scsi_sense_length  = TRANSPORT_SENSE_BUFFER;

		translate_sense_reason(cmd, TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE);

		goto queue_status;

	}
@@ -3199,6 +3196,9 @@ static int translate_sense_reason(struct se_cmd *cmd, sense_reason_t reason) 
		ascq = si->ascq;

	}



	cmd->se_cmd_flags |= SCF_EMULATED_TASK_SENSE;

	cmd->scsi_status = SAM_STAT_CHECK_CONDITION;

	cmd->scsi_sense_length  = TRANSPORT_SENSE_BUFFER;

	scsi_build_sense_buffer(desc_format, buffer, si->key, asc, ascq);

	if (si->add_sector_info)

		return scsi_set_sense_information(buffer,
@@ -3225,9 +3225,6 @@ transport_send_check_condition_and_sense(struct se_cmd *cmd, 
	if (!from_transport) {

		int rc;



		cmd->se_cmd_flags |= SCF_EMULATED_TASK_SENSE;

		cmd->scsi_status = SAM_STAT_CHECK_CONDITION;

		cmd->scsi_sense_length  = TRANSPORT_SENSE_BUFFER;

		rc = translate_sense_reason(cmd, reason);

		if (rc)

			return rc;