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

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

scsi: target/core: Remove the SCF_COMPARE_AND_WRITE_POST flag 



Commit 057085e5 ("target: Fix race for SCF_COMPARE_AND_WRITE_POST
checking") removed the code that checks the SCF_COMPARE_AND_WRITE_POST
flag.  Hence also remove the flag itself.

Cc: Nicholas Bellinger <nab@linux-iscsi.org>
Cc: Mike Christie <mchristi@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c1fbff86

drivers/target/target_core_sbc.c

+0 −6
Original line number Diff line number Diff line
@@ -425,14 +425,8 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success, 
	struct se_device *dev = cmd->se_dev;

	sense_reason_t ret = TCM_NO_SENSE;



	/*

	 * Only set SCF_COMPARE_AND_WRITE_POST to force a response fall-through

	 * within target_complete_ok_work() if the command was successfully

	 * sent to the backend driver.

	 */

	spin_lock_irq(&cmd->t_state_lock);

	if (cmd->transport_state & CMD_T_SENT) {

		cmd->se_cmd_flags |= SCF_COMPARE_AND_WRITE_POST;

		*post_ret = 1;



		if (cmd->scsi_status == SAM_STAT_CHECK_CONDITION)

include/target/target_core_base.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ enum se_cmd_flags_table { 
	SCF_ALUA_NON_OPTIMIZED		= 0x00008000,

	SCF_PASSTHROUGH_SG_TO_MEM_NOALLOC = 0x00020000,

	SCF_COMPARE_AND_WRITE		= 0x00080000,

	SCF_COMPARE_AND_WRITE_POST	= 0x00100000,

	SCF_PASSTHROUGH_PROT_SG_TO_MEM_NOALLOC = 0x00200000,

	SCF_ACK_KREF			= 0x00400000,

	SCF_USE_CPUID			= 0x00800000,