2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 1eec37c47662..fde3624dce7e 100644
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -1790,6 +1790,11 @@ static int lio_queue_status(struct se_cmd *se_cmd)
         struct iscsi_cmd *cmd = container_of(se_cmd, struct iscsi_cmd, se_cmd);
 
         cmd->i_state = ISTATE_SEND_STATUS;
+
+        if (cmd->se_cmd.scsi_status || cmd->sense_reason) {
+                iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);
+                return 0;
+        }
         cmd->conn->conn_transport->iscsit_queue_status(cmd->conn, cmd);
 
         return 0;
diff --git a/drivers/target/iscsi/iscsi_target_device.c b/drivers/target/iscsi/iscsi_target_device.c
index 6c7a5104a4cd..7087c736daa5 100644
--- a/drivers/target/iscsi/iscsi_target_device.c
+++ b/drivers/target/iscsi/iscsi_target_device.c
@@ -58,11 +58,7 @@ void iscsit_increment_maxcmdsn(struct iscsi_cmd *cmd, struct iscsi_session *sess
 
         cmd->maxcmdsn_inc = 1;
 
-        if (!mutex_trylock(&sess->cmdsn_mutex)) {
-                sess->max_cmd_sn += 1;
-                pr_debug("Updated MaxCmdSN to 0x%08x\n", sess->max_cmd_sn);
-                return;
-        }
+        mutex_lock(&sess->cmdsn_mutex);
         sess->max_cmd_sn += 1;
         pr_debug("Updated MaxCmdSN to 0x%08x\n", sess->max_cmd_sn);
         mutex_unlock(&sess->cmdsn_mutex);