include/scsi/scsi.h says: #define ABORT_TASK 0x0d
include/target/target_core_tmr.h says: #define ABORT_TASK 1
This is confusing because seeing ABORT_TASK it is not possible to find
out the value without looking up which header files are included.
Also, including target_core_tmr.h and then scsi.h will give compiler
error. Rename ABORT_TASK and alike constants to avoid confusion.
Signed-off-by: Fubo Chen <fubo.chen@xxxxxxxxx>
---
drivers/target/target_core_transport.c | 14 +++++++-------
include/target/target_core_tmr.h | 28 ++++++++--------------------
2 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/drivers/target/target_core_transport.c
b/drivers/target/target_core_transport.c
index a318927..c83603e 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -5802,26 +5802,26 @@ int transport_generic_do_tmr(struct se_cmd *cmd)
int ret;
switch (tmr->function) {
- case ABORT_TASK:
+ case TCM_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 TCM_ABORT_TASK_SET:
+ case TCM_CLEAR_ACA:
+ case TCM_CLEAR_TASK_SET:
tmr->response = TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;
break;
- case LUN_RESET:
+ case TCM_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:
+ case TCM_TARGET_WARM_RESET:
transport_generic_host_reset(dev->se_hba);
tmr->response = TMR_FUNCTION_REJECTED;
break;
- case TARGET_COLD_RESET:
+ case TCM_TARGET_COLD_RESET:
transport_generic_host_reset(dev->se_hba);
transport_generic_cold_reset(dev->se_hba);
tmr->response = TMR_FUNCTION_REJECTED;
diff --git a/include/target/target_core_tmr.h b/include/target/target_core_tmr.h
index 6c8248b..c6f02a0 100644
--- a/include/target/target_core_tmr.h
+++ b/include/target/target_core_tmr.h
@@ -2,26 +2,14 @@
#define TARGET_CORE_TMR_H
/* task management function values */
-#ifdef ABORT_TASK
-#undef ABORT_TASK
-#endif /* ABORT_TASK */
-#define ABORT_TASK 1
-#ifdef ABORT_TASK_SET
-#undef ABORT_TASK_SET
-#endif /* ABORT_TASK_SET */
-#define ABORT_TASK_SET 2
-#ifdef CLEAR_ACA
-#undef CLEAR_ACA
-#endif /* CLEAR_ACA */
-#define CLEAR_ACA 3
-#ifdef CLEAR_TASK_SET
-#undef CLEAR_TASK_SET
-#endif /* CLEAR_TASK_SET */
-#define CLEAR_TASK_SET 4
-#define LUN_RESET 5
-#define TARGET_WARM_RESET 6
-#define TARGET_COLD_RESET 7
-#define TASK_REASSIGN 8
+#define TCM_ABORT_TASK 1
+#define TCM_ABORT_TASK_SET 2
+#define TCM_CLEAR_ACA 3
+#define TCM_CLEAR_TASK_SET 4
+#define TCM_LUN_RESET 5
+#define TCM_TARGET_WARM_RESET 6
+#define TCM_TARGET_COLD_RESET 7
+#define TCM_TASK_REASSIGN 8
/* task management response values */
#define TMR_FUNCTION_COMPLETE 0
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
