aboutsummaryrefslogtreecommitdiffstats
path: root/include/target
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2011-10-09 05:02:51 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2011-10-23 23:20:58 -0400
commit8dc52b54207f361f7abf6cbe26f5199ae8b7cf23 (patch)
tree71b328bf052940a44af314b1524a2a7a3765337e /include/target
parentd270190a75e5b859c6d8eed8d4095fbb45f78264 (diff)
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 <hch@lst.de> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/target')
-rw-r--r--include/target/target_core_transport.h1
1 files changed, 0 insertions, 1 deletions
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 *);
134extern void transport_deregister_session_configfs(struct se_session *); 134extern void transport_deregister_session_configfs(struct se_session *);
135extern void transport_deregister_session(struct se_session *); 135extern void transport_deregister_session(struct se_session *);
136extern void transport_cmd_finish_abort(struct se_cmd *, int); 136extern void transport_cmd_finish_abort(struct se_cmd *, int);
137extern void transport_cmd_finish_abort_tmr(struct se_cmd *);
138extern void transport_complete_sync_cache(struct se_cmd *, int); 137extern void transport_complete_sync_cache(struct se_cmd *, int);
139extern void transport_complete_task(struct se_task *, int); 138extern void transport_complete_task(struct se_task *, int);
140extern void transport_add_task_to_execute_queue(struct se_task *, 139extern void transport_add_task_to_execute_queue(struct se_task *,