The *aborted and *tas variables are set by
__transport_wait_for_tasks() but the value that is set is ignored
by all callers due to previous patches. Hence remove the code that
sets these variables.
Signed-off-by: Bart Van Assche <bart.vanassche@xxxxxxxxxxx>
Reviewed-by: Hannes Reinecke <hare@xxxxxxxx>
Cc: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: David Disseldorp <ddiss@xxxxxxx>
---
drivers/target/target_core_transport.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 9a4671bff337..4293a693e8a4 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2504,24 +2504,21 @@ static void transport_write_pending_qf(struct se_cmd *cmd)
}
static bool
-__transport_wait_for_tasks(struct se_cmd *, bool, bool *, bool *,
- unsigned long *flags);
+__transport_wait_for_tasks(struct se_cmd *, bool, unsigned long *flags);
-static void target_wait_free_cmd(struct se_cmd *cmd, bool *aborted, bool *tas)
+static void target_wait_free_cmd(struct se_cmd *cmd)
{
unsigned long flags;
spin_lock_irqsave(&cmd->t_state_lock, flags);
- __transport_wait_for_tasks(cmd, true, aborted, tas, &flags);
+ __transport_wait_for_tasks(cmd, true, &flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
}
int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
{
- bool aborted = false, tas = false;
-
if (wait_for_tasks)
- target_wait_free_cmd(cmd, &aborted, &tas);
+ target_wait_free_cmd(cmd);
if (cmd->se_cmd_flags & SCF_SE_LUN_CMD) {
/*
@@ -2785,9 +2782,8 @@ void transport_clear_lun_ref(struct se_lun *lun)
wait_for_completion(&lun->lun_ref_comp);
}
-static bool
-__transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
- bool *aborted, bool *tas, unsigned long *flags)
+static bool __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
+ unsigned long *flags)
__releases(&cmd->t_state_lock)
__acquires(&cmd->t_state_lock)
{
@@ -2798,12 +2794,6 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
if (fabric_stop)
cmd->transport_state |= CMD_T_FABRIC_STOP;
- if (cmd->transport_state & CMD_T_ABORTED)
- *aborted = true;
-
- if (cmd->transport_state & CMD_T_TAS)
- *tas = true;
-
if (!(cmd->se_cmd_flags & SCF_SE_LUN_CMD) &&
!(cmd->se_cmd_flags & SCF_SCSI_TMR_CDB))
return false;
@@ -2815,7 +2805,7 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
if (!(cmd->transport_state & CMD_T_ACTIVE))
return false;
- if (fabric_stop && *aborted)
+ if (fabric_stop && (cmd->transport_state & CMD_T_ABORTED))
return false;
cmd->transport_state |= CMD_T_STOP;
@@ -2846,10 +2836,10 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
bool transport_wait_for_tasks(struct se_cmd *cmd)
{
unsigned long flags;
- bool ret, aborted = false, tas = false;
+ bool ret;
spin_lock_irqsave(&cmd->t_state_lock, flags);
- ret = __transport_wait_for_tasks(cmd, false, &aborted, &tas, &flags);
+ ret = __transport_wait_for_tasks(cmd, false, &flags);
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
return ret;
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
