| Message ID | 20170125233646.2243-6-bart.vanassche@sandisk.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 01/26/2017 12:36 AM, Bart Van Assche wrote: > This patch does not change any functionality. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Nicholas A. Bellinger <nab@linux-iscsi.org> > --- > drivers/target/iscsi/iscsi_target.c | 52 ++++++++++++++++++++----------------- > 1 file changed, 28 insertions(+), 24 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
> +enum { > + UNKNOWN_TMF = 0xff > +}; > + > +static enum tcm_tmreq_table iscsit_convert_tmf(u8 iscsi_tmf) > +{ > + switch (iscsi_tmf) { > + case ISCSI_TM_FUNC_ABORT_TASK: > + return TMR_ABORT_TASK; Shouldn't the unknown value start with TMF_ and be added to the enum in include/target/target_core_base.h? -- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2017-01-26 at 08:38 -0800, Christoph Hellwig wrote: > > +enum { > > + UNKNOWN_TMF = 0xff > > +}; > > + > > +static enum tcm_tmreq_table iscsit_convert_tmf(u8 iscsi_tmf) > > +{ > > + switch (iscsi_tmf) { > > + case ISCSI_TM_FUNC_ABORT_TASK: > > + return TMR_ABORT_TASK; > > Shouldn't the unknown value start with TMF_ and be added to the > enum in include/target/target_core_base.h? Hello Christoph, I will move the definition of the new constant. Thanks for the review. Bart.-- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index e11f8d0f1fa3..3696cfbf1cf5 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -1920,6 +1920,32 @@ static int iscsit_handle_nop_out(struct iscsi_conn *conn, struct iscsi_cmd *cmd, return ret; } +enum { + UNKNOWN_TMF = 0xff +}; + +static enum tcm_tmreq_table iscsit_convert_tmf(u8 iscsi_tmf) +{ + switch (iscsi_tmf) { + case ISCSI_TM_FUNC_ABORT_TASK: + return TMR_ABORT_TASK; + case ISCSI_TM_FUNC_ABORT_TASK_SET: + return TMR_ABORT_TASK_SET; + case ISCSI_TM_FUNC_CLEAR_ACA: + return TMR_CLEAR_ACA; + case ISCSI_TM_FUNC_CLEAR_TASK_SET: + return TMR_CLEAR_TASK_SET; + case ISCSI_TM_FUNC_LOGICAL_UNIT_RESET: + return TMR_LUN_RESET; + case ISCSI_TM_FUNC_TARGET_WARM_RESET: + return TMR_TARGET_WARM_RESET; + case ISCSI_TM_FUNC_TARGET_COLD_RESET: + return TMR_TARGET_COLD_RESET; + default: + return UNKNOWN_TMF; + } +} + int iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, unsigned char *buf) @@ -1985,30 +2011,8 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, target_get_sess_cmd(&cmd->se_cmd, true); sess_ref = true; - - switch (function) { - case ISCSI_TM_FUNC_ABORT_TASK: - tcm_function = TMR_ABORT_TASK; - break; - case ISCSI_TM_FUNC_ABORT_TASK_SET: - tcm_function = TMR_ABORT_TASK_SET; - break; - case ISCSI_TM_FUNC_CLEAR_ACA: - tcm_function = TMR_CLEAR_ACA; - break; - case ISCSI_TM_FUNC_CLEAR_TASK_SET: - tcm_function = TMR_CLEAR_TASK_SET; - break; - case ISCSI_TM_FUNC_LOGICAL_UNIT_RESET: - tcm_function = TMR_LUN_RESET; - break; - case ISCSI_TM_FUNC_TARGET_WARM_RESET: - tcm_function = TMR_TARGET_WARM_RESET; - break; - case ISCSI_TM_FUNC_TARGET_COLD_RESET: - tcm_function = TMR_TARGET_COLD_RESET; - break; - default: + tcm_function = iscsit_convert_tmf(function); + if (tcm_function == UNKNOWN_TMF) { pr_err("Unknown iSCSI TMR Function:" " 0x%02x\n", function); return iscsit_add_reject_cmd(cmd,
This patch does not change any functionality. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Nicholas A. Bellinger <nab@linux-iscsi.org> --- drivers/target/iscsi/iscsi_target.c | 52 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 24 deletions(-)