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

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

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



Move identical code outside an if/else statement. 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: Hannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 65422d70

drivers/target/target_core_transport.c

+2 −6
Original line number Diff line number Diff line
@@ -2664,9 +2664,6 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) 
	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);



		if (!aborted || tas)

			ret = target_put_sess_cmd(cmd);

	} else {

		if (wait_for_tasks)

			target_wait_free_cmd(cmd, &aborted, &tas);
@@ -2680,10 +2677,9 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks) 


		if (cmd->se_lun)

			transport_lun_remove_cmd(cmd);



	}

	if (!aborted || tas)

		ret = target_put_sess_cmd(cmd);

	}

	if (aborted) {

		pr_debug("Detected CMD_T_ABORTED for ITT: %llu\n", cmd->tag);

		wait_for_completion(&cmd->cmd_wait_comp);