[SCSI] target: Convert TMR REQ/RSP definitions to target namespace

This patch changes include/target/target_core_tmr.h code to use
target specific 'TMR_*' prefixed definitions for fabric independent
SCSI Task Management Request/Request naming in include/scsi/scsi.h
definitions for mainline target code.

Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 80df4056f9f1..20ab27cb3e45 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -5832,31 +5832,26 @@ int transport_generic_do_tmr(struct se_cmd *cmd)
         int ret;
 
         switch (tmr->function) {
-        case ABORT_TASK:
+        case TMR_ABORT_TASK:
                 ref_cmd = tmr->ref_cmd;
                 tmr->response = TMR_FUNCTION_REJECTED;
                 break;
-        case ABORT_TASK_SET:
-        case CLEAR_ACA:
-        case CLEAR_TASK_SET:
+        case TMR_ABORT_TASK_SET:
+        case TMR_CLEAR_ACA:
+        case TMR_CLEAR_TASK_SET:
                 tmr->response = TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;
                 break;
-        case LUN_RESET:
+        case TMR_LUN_RESET:
                 ret = core_tmr_lun_reset(dev, tmr, NULL, NULL);
                 tmr->response = (!ret) ? TMR_FUNCTION_COMPLETE :
                                          TMR_FUNCTION_REJECTED;
                 break;
-#if 0
-        case TARGET_WARM_RESET:
-                transport_generic_host_reset(dev->se_hba);
+        case TMR_TARGET_WARM_RESET:
                 tmr->response = TMR_FUNCTION_REJECTED;
                 break;
-        case TARGET_COLD_RESET:
-                transport_generic_host_reset(dev->se_hba);
-                transport_generic_cold_reset(dev->se_hba);
+        case TMR_TARGET_COLD_RESET:
                 tmr->response = TMR_FUNCTION_REJECTED;
                 break;
-#endif
         default:
                 printk(KERN_ERR "Uknown TMR function: 0x%02x.\n",
                                 tmr->function);