target: pass sense_reason as a return value

Pass the sense reason as an explicit return value from the I/O submission
path instead of storing it in struct se_cmd and using negative return
values.  This cleans up a lot of the code pathes, and with the sparse
annotations for the new sense_reason_t type allows for much better
error checking.

(nab: Convert spc_emulate_modesense + spc_emulate_modeselect to use
      sense_reason_t with Roland's MODE SELECT changes)

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 21f29d91a8cb..0b52a2371305 100644
--- a/drivers/target/iscsi/iscsi_target_erl1.c
+++ b/drivers/target/iscsi/iscsi_target_erl1.c
@@ -929,11 +929,10 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
         case ISCSI_OP_SCSI_CMD:
                 /*
                  * Go ahead and send the CHECK_CONDITION status for
-                 * any SCSI CDB exceptions that may have occurred, also
-                 * handle the SCF_SCSI_RESERVATION_CONFLICT case here as well.
+                 * any SCSI CDB exceptions that may have occurred.
                  */
-                if (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION) {
-                        if (se_cmd->scsi_sense_reason == TCM_RESERVATION_CONFLICT) {
+                if (cmd->sense_reason) {
+                        if (cmd->sense_reason == TCM_RESERVATION_CONFLICT) {
                                 cmd->i_state = ISTATE_SEND_STATUS;
                                 spin_unlock_bh(&cmd->istate_lock);
                                 iscsit_add_cmd_to_response_queue(cmd, cmd->conn,
@@ -956,7 +955,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
                          * exception
                          */
                         return transport_send_check_condition_and_sense(se_cmd,
-                                        se_cmd->scsi_sense_reason, 0);
+                                        cmd->sense_reason, 0);
                 }
                 /*
                  * Special case for delayed CmdSN with Immediate
@@ -1013,7 +1012,7 @@ int iscsit_execute_cmd(struct iscsi_cmd *cmd, int ooo)
                 iscsit_add_cmd_to_response_queue(cmd, cmd->conn, cmd->i_state);
                 break;
         case ISCSI_OP_SCSI_TMFUNC:
-                if (se_cmd->se_cmd_flags & SCF_SCSI_CDB_EXCEPTION) {
+                if (cmd->se_cmd.se_tmr_req->response) {
                         spin_unlock_bh(&cmd->istate_lock);
                         iscsit_add_cmd_to_response_queue(cmd, cmd->conn,
                                         cmd->i_state);