target: Merge transport_cmd_finish_abort_tmr into transport_cmd_finish_abort

This patch merges transport_cmd_finish_abort_tmr() logic into a single
transport_cmd_finish_abort() function by adding a cmd->se_tmr_req check
around transport_lun_remove_cmd(), and updates the single caller within
core_tmr_drain_tmr_list().

Reported-by: Christoph Hellwig <hch@lst.de>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

2 files changed, 3 insertions, 12 deletions

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index efc5ec7da57c..b8dc10fd4ef7 100644
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -161,7 +161,7 @@ static void core_tmr_drain_tmr_list(
                         (preempt_and_abort_list) ? "Preempt" : "", tmr,
                         tmr->function, tmr->response, cmd->t_state);
 
-                transport_cmd_finish_abort_tmr(cmd);
+                transport_cmd_finish_abort(cmd, 1);
         }
 }
 
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index f8de042e532e..36fb39c2ce03 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -591,7 +591,8 @@ check_lun:
 
 void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
 {
-        transport_lun_remove_cmd(cmd);
+        if (!cmd->se_tmr_req)
+                transport_lun_remove_cmd(cmd);
 
         if (transport_cmd_check_stop_to_fabric(cmd))
                 return;
@@ -601,16 +602,6 @@ void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
         }
 }
 
-void transport_cmd_finish_abort_tmr(struct se_cmd *cmd)
-{
-        transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj);
-
-        if (transport_cmd_check_stop_to_fabric(cmd))
-                return;
-
-        transport_put_cmd(cmd);
-}
-
 static void transport_add_cmd_to_queue(
         struct se_cmd *cmd,
         int t_state)