scsi: target/core: Remove the SCF_COMPARE_AND_WRITE_POST flag
authorBart Van Assche <bvanassche@acm.org>
Mon, 15 Oct 2018 15:51:36 +0000 (08:51 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 16 Oct 2018 05:13:35 +0000 (01:13 -0400)
Commit 057085e522f8 ("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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/target/target_core_sbc.c
include/target/target_core_base.h

index ebac2b4..f2c3b67 100644 (file)
@@ -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)
index 7a4ee78..e3bdb05 100644 (file)
@@ -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,