3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index 44262908def5..bf0e8e75a272 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -1363,7 +1363,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
                  * outstanding_r2ts reaches zero, go ahead and send the delayed
                  * TASK_ABORTED status.
                  */
-                if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
+                if (se_cmd->transport_state & CMD_T_ABORTED) {
                         if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
                                 if (--cmd->outstanding_r2ts < 1) {
                                         iscsit_stop_dataout_timer(cmd);
diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 27901e37c125..006f605edb08 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -416,7 +416,7 @@ static int iscsit_handle_recovery_datain(
         struct iscsi_datain_req *dr;
         struct se_cmd *se_cmd = &cmd->se_cmd;
 
-        if (!atomic_read(&se_cmd->t_transport_complete)) {
+        if (!(se_cmd->transport_state & CMD_T_COMPLETE)) {
                 pr_err("Ignoring ITT: 0x%08x Data SNACK\n",
                                 cmd->init_task_tag);
                 return 0;
diff --git a/drivers/target/iscsi/iscsi_target_tmr.c b/drivers/target/iscsi/iscsi_target_tmr.c
index 255ed35da815..e01da9d2b37e 100644
--- a/drivers/target/iscsi/iscsi_target_tmr.c
+++ b/drivers/target/iscsi/iscsi_target_tmr.c
@@ -250,7 +250,7 @@ static int iscsit_task_reassign_complete_write(
          * so if we have received all DataOUT we can safety ignore Initiator.
          */
         if (cmd->cmd_flags & ICF_GOT_LAST_DATAOUT) {
-                if (!atomic_read(&cmd->se_cmd.t_transport_sent)) {
+                if (!(cmd->se_cmd.transport_state & CMD_T_SENT)) {
                         pr_debug("WRITE ITT: 0x%08x: t_state: %d"
                                 " never sent to transport\n",
                                 cmd->init_task_tag, cmd->se_cmd.t_state);
@@ -314,7 +314,7 @@ static int iscsit_task_reassign_complete_read(
                 cmd->acked_data_sn = (tmr_req->exp_data_sn - 1);
         }
 
-        if (!atomic_read(&cmd->se_cmd.t_transport_sent)) {
+        if (!(cmd->se_cmd.transport_state & CMD_T_SENT)) {
                 pr_debug("READ ITT: 0x%08x: t_state: %d never sent to"
                         " transport\n", cmd->init_task_tag,
                         cmd->se_cmd.t_state);
@@ -322,7 +322,7 @@ static int iscsit_task_reassign_complete_read(
                 return 0;
         }
 
-        if (!atomic_read(&se_cmd->t_transport_complete)) {
+        if (!(se_cmd->transport_state & CMD_T_COMPLETE)) {
                 pr_err("READ ITT: 0x%08x: t_state: %d, never returned"
                         " from transport\n", cmd->init_task_tag,
                         cmd->se_cmd.t_state);