2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index a6e1edcfefbd..42c2a44b83dd 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1827,6 +1827,8 @@ static bool target_handle_task_attr(struct se_cmd *cmd)
         if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)
                 return false;
 
+        cmd->se_cmd_flags |= SCF_TASK_ATTR_SET;
+
         /*
          * Check for the existence of HEAD_OF_QUEUE, and if true return 1
          * to allow the passed struct se_cmd list of tasks to the front of the list.
@@ -1949,6 +1951,9 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
         if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)
                 return;
 
+        if (!(cmd->se_cmd_flags & SCF_TASK_ATTR_SET))
+                goto restart;
+
         if (cmd->sam_task_attr == TCM_SIMPLE_TAG) {
                 atomic_dec_mb(&dev->simple_cmds);
                 dev->dev_cur_ordered_id++;
@@ -1965,7 +1970,7 @@ static void transport_complete_task_attr(struct se_cmd *cmd)
                 pr_debug("Incremented dev_cur_ordered_id: %u for ORDERED\n",
                          dev->dev_cur_ordered_id);
         }
-
+restart:
         target_restart_delayed_cmds(dev);
 }
 
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index b316b44d03f3..fb8e3b6febdf 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -142,6 +142,7 @@ enum se_cmd_flags_table {
         SCF_PASSTHROUGH_PROT_SG_TO_MEM_NOALLOC = 0x00200000,
         SCF_ACK_KREF                    = 0x00400000,
         SCF_USE_CPUID                   = 0x00800000,
+        SCF_TASK_ATTR_SET               = 0x01000000,
 };
 
 /*