On Wed, Dec 07, 2022 at 09:10:01PM -0600, Mike Christie wrote:
>
> The tas arg is no longer used by callers of __transport_wait_for_tasks
> so drop it.
>
> Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
> ---
> drivers/target/target_core_transport.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
> index 8bbf0c834b74..d42ba260f197 100644
> --- a/drivers/target/target_core_transport.c
> +++ b/drivers/target/target_core_transport.c
> @@ -2902,15 +2902,14 @@ 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, 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, bool *aborted)
> {
> 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, aborted, &flags);
> spin_unlock_irqrestore(&cmd->t_state_lock, flags);
> }
>
> @@ -2955,10 +2954,10 @@ int transport_generic_free_cmd(struct se_cmd *cmd, int wait_for_tasks)
> {
> DECLARE_COMPLETION_ONSTACK(compl);
> int ret = 0;
> - bool aborted = false, tas = false;
> + bool aborted = false;
>
> if (wait_for_tasks)
> - target_wait_free_cmd(cmd, &aborted, &tas);
> + target_wait_free_cmd(cmd, &aborted);
>
> if (cmd->se_cmd_flags & SCF_SE_LUN_CMD) {
> /*
> @@ -3237,7 +3236,7 @@ void transport_clear_lun_ref(struct se_lun *lun)
>
> static bool
> __transport_wait_for_tasks(struct se_cmd *cmd, bool fabric_stop,
> - bool *aborted, bool *tas, unsigned long *flags)
> + bool *aborted, unsigned long *flags)
> __releases(&cmd->t_state_lock)
> __acquires(&cmd->t_state_lock)
> {
> @@ -3249,9 +3248,6 @@ __transport_wait_for_tasks(struct se_cmd *cmd, bool 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;
> @@ -3292,10 +3288,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, aborted = false;
>
> 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, &aborted, &flags);
> spin_unlock_irqrestore(&cmd->t_state_lock, flags);
>
> return ret;
> --
> 2.25.1
>
>
Reviewed-by: Dmitry Bogdanov <d.bogdanov@xxxxxxxxx>
