瀏覽代碼

target: remove unused codes from enum tcm_tmrsp_table

Three have been checked for but were never set.  Remove the dead code.
Also renumbers the remaining ones to a) get rid of the holes after the
removal and b) avoid a collision between TMR_FUNCTION_COMPLETE==0 and
the uninitialized case.  If we failed to set a code, we should rather
fall into the default case then return success.

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Joern Engel 12 年之前
父節點
當前提交
11fee8a751
共有 3 個文件被更改,包括 5 次插入13 次删除
  1. 0 2
      drivers/target/iscsi/iscsi_target.c
  2. 0 3
      drivers/target/tcm_fc/tfc_cmd.c
  3. 5 8
      include/target/target_core_base.h

+ 0 - 2
drivers/target/iscsi/iscsi_target.c

@@ -3286,8 +3286,6 @@ static u8 iscsit_convert_tcm_tmr_rsp(struct se_tmr_req *se_tmr)
 		return ISCSI_TMF_RSP_NO_LUN;
 		return ISCSI_TMF_RSP_NO_LUN;
 	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
 	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
 		return ISCSI_TMF_RSP_NOT_SUPPORTED;
 		return ISCSI_TMF_RSP_NOT_SUPPORTED;
-	case TMR_FUNCTION_AUTHORIZATION_FAILED:
-		return ISCSI_TMF_RSP_AUTH_FAILED;
 	case TMR_FUNCTION_REJECTED:
 	case TMR_FUNCTION_REJECTED:
 	default:
 	default:
 		return ISCSI_TMF_RSP_REJECTED;
 		return ISCSI_TMF_RSP_REJECTED;

+ 0 - 3
drivers/target/tcm_fc/tfc_cmd.c

@@ -413,10 +413,7 @@ int ft_queue_tm_resp(struct se_cmd *se_cmd)
 		code = FCP_TMF_REJECTED;
 		code = FCP_TMF_REJECTED;
 		break;
 		break;
 	case TMR_TASK_DOES_NOT_EXIST:
 	case TMR_TASK_DOES_NOT_EXIST:
-	case TMR_TASK_STILL_ALLEGIANT:
-	case TMR_TASK_FAILOVER_NOT_SUPPORTED:
 	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
 	case TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED:
-	case TMR_FUNCTION_AUTHORIZATION_FAILED:
 	default:
 	default:
 		code = FCP_TMF_FAILED;
 		code = FCP_TMF_FAILED;
 		break;
 		break;

+ 5 - 8
include/target/target_core_base.h

@@ -218,14 +218,11 @@ enum tcm_tmreq_table {
 
 
 /* fabric independent task management response values */
 /* fabric independent task management response values */
 enum tcm_tmrsp_table {
 enum tcm_tmrsp_table {
-	TMR_FUNCTION_COMPLETE		= 0,
-	TMR_TASK_DOES_NOT_EXIST		= 1,
-	TMR_LUN_DOES_NOT_EXIST		= 2,
-	TMR_TASK_STILL_ALLEGIANT	= 3,
-	TMR_TASK_FAILOVER_NOT_SUPPORTED	= 4,
-	TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	= 5,
-	TMR_FUNCTION_AUTHORIZATION_FAILED = 6,
-	TMR_FUNCTION_REJECTED		= 255,
+	TMR_FUNCTION_COMPLETE		= 1,
+	TMR_TASK_DOES_NOT_EXIST		= 2,
+	TMR_LUN_DOES_NOT_EXIST		= 3,
+	TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED	= 4,
+	TMR_FUNCTION_REJECTED		= 5,
 };
 };
 
 
 /*
 /*