target/core: Simplify the LUN RESET implementation
PATCH 3/16 target/core: Simplify the LUN RESET implementation
Due to the task management handling rework it is safe to wait for a TMF that is not in the active state. Hence remove the CMD_T_ACTIVE test from core_tmr_drain_tmr_list(). Additionally, call __target_check_io_state() instead of open coding it.
Reviewed-by Hannes Reinecke <[email protected]>
Cc Nicholas Bellinger <[email protected]>
Cc Mike Christie <[email protected]>
Cc Christoph Hellwig <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/target/target_core_tmr.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/target/target_core_tmr.c +2 -12
@@ -217,23 +217,13 @@ static void core_tmr_drain_tmr_list(continue ;spin_lock (&sess->sess_cmd_lock); -spin_lock (&cmd->t_state_lock); -if (!(cmd->transport_state &CMD_T_ACTIVE ) || - (cmd->transport_state &CMD_T_FABRIC_STOP )) { -spin_unlock (&cmd->t_state_lock); -spin_unlock (&sess->sess_cmd_lock); -continue ; - } - cmd->transport_state |=CMD_T_ABORTED ; -spin_unlock (&cmd->t_state_lock); + rc =__target_check_io_state (cmd, sess,0 ); +spin_unlock (&sess->sess_cmd_lock); - rc =kref_get_unless_zero (&cmd->cmd_kref);if (!rc) {printk ("LUN_RESET TMR: non-zero kref_get_unless_zero\n" ); -spin_unlock (&sess->sess_cmd_lock);continue ; } -spin_unlock (&sess->sess_cmd_lock);list_move_tail (&tmr_p->tmr_list, &drain_tmr_list); }
Signature · 1 line
2.20.1.495.gaa96b0ce6b-goog