Commit edf46eee authored Jun 22, 2018 by Bart Van Assche Committed by Martin K. Petersen Jul 02, 2018

scsi: target: Simplify transport_generic_free_cmd() (2/2)



Since target_wait_free_cmd() skips TMFs with no associated LUN, it is safe
to call that function for such commands. Use this to simplify
transport_generic_free_cmd(). The only functional change in this patch is
that CMD_T_FABRIC_STOP gets set for TMFs with no associated LUN by
transport_generic_free_cmd().

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Mike Christie <mchristi@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent a8864d86

drivers/target/target_core_transport.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -2661,12 +2661,10 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
		int ret = 0;
		bool aborted = false, tas = false;

		if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD)) {
		if (wait_for_tasks && (cmd->se_cmd_flags & SCF_SCSI_TMR_CDB))
		target_wait_free_cmd(cmd, &aborted, &tas);
		} else {
		if (wait_for_tasks)
		target_wait_free_cmd(cmd, &aborted, &tas);

		if (cmd->se_cmd_flags & SCF_SE_LUN_CMD) {
		/*
		* Handle WRITE failure case where transport_generic_new_cmd()
		* has already added se_cmd to state_list, but fabric has