Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5c6cd613196558ba50ba97268b6d225c8d2f56d6

Authored by Nicholas Bellinger
Committed by James Bottomley
1 parent 065f97161b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 29 additions and 42 deletions Side-by-side Diff

drivers/target/target_core_transport.c
Diff comments   View file @ 5c6cd61
... ... @@ -5832,31 +5832,26 @@
5832 5832 int ret;
5833 5833  
5834 5834 switch (tmr->function) {
5835   - case ABORT_TASK:
  5835 + case TMR_ABORT_TASK:
5836 5836 ref_cmd = tmr->ref_cmd;
5837 5837 tmr->response = TMR_FUNCTION_REJECTED;
5838 5838 break;
5839   - case ABORT_TASK_SET:
5840   - case CLEAR_ACA:
5841   - case CLEAR_TASK_SET:
  5839 + case TMR_ABORT_TASK_SET:
  5840 + case TMR_CLEAR_ACA:
  5841 + case TMR_CLEAR_TASK_SET:
5842 5842 tmr->response = TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED;
5843 5843 break;
5844   - case LUN_RESET:
  5844 + case TMR_LUN_RESET:
5845 5845 ret = core_tmr_lun_reset(dev, tmr, NULL, NULL);
5846 5846 tmr->response = (!ret) ? TMR_FUNCTION_COMPLETE :
5847 5847 TMR_FUNCTION_REJECTED;
5848 5848 break;
5849   -#if 0
5850   - case TARGET_WARM_RESET:
5851   - transport_generic_host_reset(dev->se_hba);
  5849 + case TMR_TARGET_WARM_RESET:
5852 5850 tmr->response = TMR_FUNCTION_REJECTED;
5853 5851 break;
5854   - case TARGET_COLD_RESET:
5855   - transport_generic_host_reset(dev->se_hba);
5856   - transport_generic_cold_reset(dev->se_hba);
  5852 + case TMR_TARGET_COLD_RESET:
5857 5853 tmr->response = TMR_FUNCTION_REJECTED;
5858 5854 break;
5859   -#endif
5860 5855 default:
5861 5856 printk(KERN_ERR "Uknown TMR function: 0x%02x.\n",
5862 5857 tmr->function);
include/target/target_core_tmr.h
Diff comments   View file @ 5c6cd61
1 1 #ifndef TARGET_CORE_TMR_H
2 2 #define TARGET_CORE_TMR_H
3 3  
4   -/* task management function values */
5   -#ifdef ABORT_TASK
6   -#undef ABORT_TASK
7   -#endif /* ABORT_TASK */
8   -#define ABORT_TASK 1
9   -#ifdef ABORT_TASK_SET
10   -#undef ABORT_TASK_SET
11   -#endif /* ABORT_TASK_SET */
12   -#define ABORT_TASK_SET 2
13   -#ifdef CLEAR_ACA
14   -#undef CLEAR_ACA
15   -#endif /* CLEAR_ACA */
16   -#define CLEAR_ACA 3
17   -#ifdef CLEAR_TASK_SET
18   -#undef CLEAR_TASK_SET
19   -#endif /* CLEAR_TASK_SET */
20   -#define CLEAR_TASK_SET 4
21   -#define LUN_RESET 5
22   -#define TARGET_WARM_RESET 6
23   -#define TARGET_COLD_RESET 7
24   -#define TASK_REASSIGN 8
  4 +/* fabric independent task management function values */
  5 +enum tcm_tmreq_table {
  6 + TMR_ABORT_TASK = 1,
  7 + TMR_ABORT_TASK_SET = 2,
  8 + TMR_CLEAR_ACA = 3,
  9 + TMR_CLEAR_TASK_SET = 4,
  10 + TMR_LUN_RESET = 5,
  11 + TMR_TARGET_WARM_RESET = 6,
  12 + TMR_TARGET_COLD_RESET = 7,
  13 + TMR_FABRIC_TMR = 255,
  14 +};
25 15  
26   -/* task management response values */
27   -#define TMR_FUNCTION_COMPLETE 0
28   -#define TMR_TASK_DOES_NOT_EXIST 1
29   -#define TMR_LUN_DOES_NOT_EXIST 2
30   -#define TMR_TASK_STILL_ALLEGIANT 3
31   -#define TMR_TASK_FAILOVER_NOT_SUPPORTED 4
32   -#define TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED 5
33   -#define TMR_FUNCTION_AUTHORIZATION_FAILED 6
34   -#define TMR_FUNCTION_REJECTED 255
  16 +/* fabric independent task management response values */
  17 +enum tcm_tmrsp_table {
  18 + TMR_FUNCTION_COMPLETE = 0,
  19 + TMR_TASK_DOES_NOT_EXIST = 1,
  20 + TMR_LUN_DOES_NOT_EXIST = 2,
  21 + TMR_TASK_STILL_ALLEGIANT = 3,
  22 + TMR_TASK_FAILOVER_NOT_SUPPORTED = 4,
  23 + TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED = 5,
  24 + TMR_FUNCTION_AUTHORIZATION_FAILED = 6,
  25 + TMR_FUNCTION_REJECTED = 255,
  26 +};
35 27  
36 28 extern struct kmem_cache *se_tmr_req_cache;
37 29