target/core: Always call transport_complete_callback() upon failure
PATCH 9/17 target/core: Always call transport_complete_callback() upon failure
Call transport_complete_callback() not only if COMPARE AND WRITE fails but also if XDWRITEREAD fails. This makes the code more systematic.
--- drivers/target/target_core_sbc.c | 6 +++++- drivers/target/target_core_transport.c | 11 +++-------- 2 files changed, 8 insertions(+), 9 deletions(-)
drivers/target/target_core_sbc.c +5 -1
@@ -360,6 +360,10 @@ static sense_reason_t xdreadwrite_callback(struct se_cmd *cmd, bool success,unsigned int offset;sense_reason_t ret =TCM_NO_SENSE ;int i, count; + +if (!success) +return 0 ; +/* * From sbc3r22.pdf section 5.48 XDWRITEREAD (10) command *
@@ -431,7 +435,7 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success,* sent to the backend driver. */ spin_lock_irq (&cmd->t_state_lock); -if (cmd->transport_state &CMD_T_SENT ) { +if (success) { cmd->se_cmd_flags |=SCF_COMPARE_AND_WRITE_POST ; *post_ret =1 ;
drivers/target/target_core_transport.c +3 -8
@@ -1793,7 +1793,7 @@ EXPORT_SYMBOL(target_submit_tmr);void transport_generic_request_failure (struct se_cmd *cmd,sense_reason_t sense_reason) { -int ret =0 , post_ret =0 ; +int ret =0 ;pr_debug ("-----[ Storage Engine Exception; sense_reason %d\n" , sense_reason);
@@ -1804,13 +1804,8 @@ void transport_generic_request_failure(struct se_cmd *cmd,*/ transport_complete_task_attr (cmd); -/* -* Handle special case for COMPARE_AND_WRITE failure, where the -* callback is expected to drop the per device ->caw_sem. -*/ -if ((cmd->se_cmd_flags &SCF_COMPARE_AND_WRITE ) && - cmd->transport_complete_callback) - cmd->transport_complete_callback (cmd, false, &post_ret); +if (cmd->transport_complete_callback) + cmd->transport_complete_callback (cmd, false,NULL );if (transport_check_aborted_status (cmd,1 ))return ;
Signature · 1 line
2.18.0
Quoted 2 lines · Bart Van Assche
Call
transport_complete_callback()not only if COMPARE AND WRITE fails but also if XDWRITEREAD fails. This makes the code more systematic.
This looks ok:
But I wonder if transport_complete_callback should really be split into multiple more specific callbacks instead.
Quoted 56 lines · Bart Van Assche
Call
transport_complete_callback()not only if COMPARE AND WRITE fails but also if XDWRITEREAD fails. This makes the code more systematic.Signed-off-by Bart Van Assche <[email protected]>Cc Nicholas Bellinger <[email protected]>Cc Mike Christie <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Hannes Reinecke <[email protected]>--- drivers/target/target_core_sbc.c | 6 +++++- drivers/target/target_core_transport.c | 11 +++-------- 2 files changed, 8 insertions(+), 9 deletions(-)drivers/target/target_core_sbc.c +5
-1@@ -360,6 +360,10 @@ static sense_reason_t xdreadwrite_callback(struct se_cmd *cmd, bool success,unsigned int offset;sense_reason_t ret =TCM_NO_SENSE ;int i, count; + +if (!success) +return 0 ; +/* * From sbc3r22.pdf section 5.48 XDWRITEREAD (10) command * @@ -431,7 +435,7 @@ static sense_reason_t compare_and_write_post(struct se_cmd *cmd, bool success,* sent to the backend driver. */ spin_lock_irq (&cmd->t_state_lock); -if (cmd->transport_state &CMD_T_SENT ) { +if (success) { cmd->se_cmd_flags |=SCF_COMPARE_AND_WRITE_POST ; *post_ret =1 ;drivers/target/target_core_transport.c +1
-3@@ -1793,7 +1793,7 @@ EXPORT_SYMBOL(target_submit_tmr);void transport_generic_request_failure (struct se_cmd *cmd,sense_reason_t sense_reason) { -int ret =0 , post_ret =0 ; +int ret =0 ;pr_debug ("-----[ Storage Engine Exception; sense_reason %d\n" , sense_reason);@@ -1804,13 +1804,8 @@ void transport_generic_request_failure(struct se_cmd *cmd,*/ transport_complete_task_attr (cmd); -/* -* Handle special case for COMPARE_AND_WRITE failure, where the
drivers/target/target_core_transport.c void transport_generic_request_failure(struct se_cmd *cmd, · line 1811
Quoted 10 lines
drivers/target/target_core_transport.c +2
-5-* callback is expected to drop the per device ->caw_sem. -*/ -if ((cmd->se_cmd_flags &SCF_COMPARE_AND_WRITE ) && - cmd->transport_complete_callback) - cmd->transport_complete_callback (cmd, false, &post_ret); +if (cmd->transport_complete_callback) + cmd->transport_complete_callback (cmd, false,NULL );if (transport_check_aborted_status (cmd,1 ))return ;
Looks OK wrt earlier COMPARE_AND_WRITE failure cases originally addressed in commit 9b2792c3d.