1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 40d9dbca987b..586c268679a4 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -162,9 +162,8 @@ static int iscsit_handle_r2t_snack(
                         " protocol error.\n", cmd->init_task_tag, begrun,
                         (begrun + runlength), cmd->acked_data_sn);
 
-                        return iscsit_add_reject_from_cmd(
-                                        ISCSI_REASON_PROTOCOL_ERROR,
-                                        1, 0, buf, cmd);
+                        return iscsit_reject_cmd(cmd,
+                                        ISCSI_REASON_PROTOCOL_ERROR, buf);
         }
 
         if (runlength) {
@@ -173,8 +172,8 @@ static int iscsit_handle_r2t_snack(
                         " with BegRun: 0x%08x, RunLength: 0x%08x, exceeds"
                         " current R2TSN: 0x%08x, protocol error.\n",
                         cmd->init_task_tag, begrun, runlength, cmd->r2t_sn);
-                        return iscsit_add_reject_from_cmd(
-                                ISCSI_REASON_BOOKMARK_INVALID, 1, 0, buf, cmd);
+                        return iscsit_reject_cmd(cmd,
+                                        ISCSI_REASON_BOOKMARK_INVALID, buf);
                 }
                 last_r2tsn = (begrun + runlength);
         } else
@@ -433,8 +432,7 @@ static int iscsit_handle_recovery_datain(
                         " protocol error.\n", cmd->init_task_tag, begrun,
                         (begrun + runlength), cmd->acked_data_sn);
 
-                return iscsit_add_reject_from_cmd(ISCSI_REASON_PROTOCOL_ERROR,
-                                1, 0, buf, cmd);
+                return iscsit_reject_cmd(cmd, ISCSI_REASON_PROTOCOL_ERROR, buf);
         }
 
         /*
@@ -445,14 +443,14 @@ static int iscsit_handle_recovery_datain(
                 pr_err("Initiator requesting BegRun: 0x%08x, RunLength"
                         ": 0x%08x greater than maximum DataSN: 0x%08x.\n",
                                 begrun, runlength, (cmd->data_sn - 1));
-                return iscsit_add_reject_from_cmd(ISCSI_REASON_BOOKMARK_INVALID,
-                                1, 0, buf, cmd);
+                return iscsit_reject_cmd(cmd, ISCSI_REASON_BOOKMARK_INVALID,
+                                         buf);
         }
 
         dr = iscsit_allocate_datain_req();
         if (!dr)
-                return iscsit_add_reject_from_cmd(ISCSI_REASON_BOOKMARK_NO_RESOURCES,
-                                1, 0, buf, cmd);
+                return iscsit_reject_cmd(cmd, ISCSI_REASON_BOOKMARK_NO_RESOURCES,
+                                         buf);
 
         dr->data_sn = dr->begrun = begrun;
         dr->runlength = runlength;
@@ -1090,7 +1088,7 @@ int iscsit_handle_ooo_cmdsn(
 
         ooo_cmdsn = iscsit_allocate_ooo_cmdsn();
         if (!ooo_cmdsn)
-                return CMDSN_ERROR_CANNOT_RECOVER;
+                return -ENOMEM;
 
         ooo_cmdsn->cmd                  = cmd;
         ooo_cmdsn->batch_count          = (batch) ?
@@ -1101,10 +1099,10 @@ int iscsit_handle_ooo_cmdsn(
 
         if (iscsit_attach_ooo_cmdsn(sess, ooo_cmdsn) < 0) {
                 kmem_cache_free(lio_ooo_cache, ooo_cmdsn);
-                return CMDSN_ERROR_CANNOT_RECOVER;
+                return -ENOMEM;
         }
 
-        return CMDSN_HIGHER_THAN_EXP;
+        return 0;
 }
 
 static int iscsit_set_dataout_timeout_values(