2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 51a9736be726..c50fd9f11aab 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -594,10 +594,11 @@ static void transport_lun_remove_cmd(struct se_cmd *cmd)
 {
         struct se_lun *lun = cmd->se_lun;
 
-        if (!lun || !cmd->lun_ref_active)
+        if (!lun)
                 return;
 
-        percpu_ref_put(&lun->lun_ref);
+        if (cmpxchg(&cmd->lun_ref_active, true, false))
+                percpu_ref_put(&lun->lun_ref);
 }
 
 void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index d28418645b00..909dacbd230f 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -552,7 +552,7 @@ struct se_cmd {
         void                    *priv;
 
         /* Used for lun->lun_ref counting */
-        bool                    lun_ref_active;
+        int                     lun_ref_active;
 
         /* DIF related members */
         enum target_prot_op     prot_op;