scsi: qla2xxx: Remove qla_tgt_cmd.released

Since the previous patch removed the only statement that sets
qla_tgt_cmd.released, remove the code that depends on that member variable
being set and the member variable itself.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 8fb197a4d740c48bd7b981bdcea2ece564fc517f..262fc33fb473808018f6d79f1fd8173de72674f9 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -889,7 +889,6 @@ struct qla_tgt_cmd {
        unsigned int term_exchg:1;
        unsigned int cmd_sent_to_fw:1;
        unsigned int cmd_in_wq:1;
-       unsigned int released:1;
 
        /*
         * This variable may be set from outside the LIO and I/O completion

diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 86db07309302a08105464f44a616d42193094bcb..701e8f891af5ff6113525c50872f2bac80dd780b 100644 (file)
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -261,7 +261,6 @@ static void tcm_qla2xxx_free_mcmd(struct qla_tgt_mgmt_cmd *mcmd)
 static void tcm_qla2xxx_complete_free(struct work_struct *work)
 {
        struct qla_tgt_cmd *cmd = container_of(work, struct qla_tgt_cmd, work);
-       bool released = false;
        unsigned long flags;
 
        cmd->cmd_in_wq = 0;
@@ -272,14 +271,9 @@ static void tcm_qla2xxx_complete_free(struct work_struct *work)
        cmd->qpair->tgt_counters.qla_core_ret_sta_ctio++;
        cmd->trc_flags |= TRC_CMD_FREE;
        cmd->cmd_sent_to_fw = 0;
-       if (cmd->released)
-               released = true;
        spin_unlock_irqrestore(&cmd->cmd_lock, flags);
 
-       if (released)
-               qlt_free_cmd(cmd);
-       else
-               transport_generic_free_cmd(&cmd->se_cmd, 0);
+       transport_generic_free_cmd(&cmd->se_cmd, 0);
 }
 
 /*
@@ -489,13 +483,6 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
 
        spin_lock_irqsave(&cmd->cmd_lock, flags);
        cmd->cmd_sent_to_fw = 0;
-
-       if (cmd->released) {
-               spin_unlock_irqrestore(&cmd->cmd_lock, flags);
-               qlt_free_cmd(cmd);
-               return;
-       }
-
        if (cmd->aborted) {
                spin_unlock_irqrestore(&cmd->cmd_lock, flags);