target: pass sense_reason as a return value

[cascardo/linux.git] / drivers / target / iscsi / iscsi_target_erl1.c

diff --git a/drivers/target/iscsi/iscsi_target_erl1.c b/drivers/target/iscsi/iscsi_target_erl1.c
index 21f29d9..0b52a23 100644 (file)
--- 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);