From: Nicholas Bellinger Date: Sun, 9 Oct 2011 09:02:51 +0000 (-0700) Subject: target: Merge transport_cmd_finish_abort_tmr into transport_cmd_finish_abort X-Git-Tag: v5.15~23786^2~54 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8dc52b54207f361f7abf6cbe26f5199ae8b7cf23;p=mirror_ubuntu-kernels.git target: Merge transport_cmd_finish_abort_tmr into transport_cmd_finish_abort This patch merges transport_cmd_finish_abort_tmr() logic into a single transport_cmd_finish_abort() function by adding a cmd->se_tmr_req check around transport_lun_remove_cmd(), and updates the single caller within core_tmr_drain_tmr_list(). Reported-by: Christoph Hellwig Cc: Christoph Hellwig Signed-off-by: Nicholas Bellinger --- diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index efc5ec7da57c..b8dc10fd4ef7 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c @@ -161,7 +161,7 @@ static void core_tmr_drain_tmr_list( (preempt_and_abort_list) ? "Preempt" : "", tmr, tmr->function, tmr->response, cmd->t_state); - transport_cmd_finish_abort_tmr(cmd); + transport_cmd_finish_abort(cmd, 1); } } diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index f8de042e532e..36fb39c2ce03 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -591,7 +591,8 @@ check_lun: void transport_cmd_finish_abort(struct se_cmd *cmd, int remove) { - transport_lun_remove_cmd(cmd); + if (!cmd->se_tmr_req) + transport_lun_remove_cmd(cmd); if (transport_cmd_check_stop_to_fabric(cmd)) return; @@ -601,16 +602,6 @@ void transport_cmd_finish_abort(struct se_cmd *cmd, int remove) } } -void transport_cmd_finish_abort_tmr(struct se_cmd *cmd) -{ - transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj); - - if (transport_cmd_check_stop_to_fabric(cmd)) - return; - - transport_put_cmd(cmd); -} - static void transport_add_cmd_to_queue( struct se_cmd *cmd, int t_state) diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h index 371c24aff23e..c91516910e3e 100644 --- a/include/target/target_core_transport.h +++ b/include/target/target_core_transport.h @@ -134,7 +134,6 @@ extern void transport_free_session(struct se_session *); extern void transport_deregister_session_configfs(struct se_session *); extern void transport_deregister_session(struct se_session *); extern void transport_cmd_finish_abort(struct se_cmd *, int); -extern void transport_cmd_finish_abort_tmr(struct se_cmd *); extern void transport_complete_sync_cache(struct se_cmd *, int); extern void transport_complete_task(struct se_task *, int); extern void transport_add_task_to_execute_queue(struct se_task *,