target: Merge transport_cmd_finish_abort_tmr into transport_cmd_finish_abort
authorNicholas Bellinger <nab@linux-iscsi.org>
Sun, 9 Oct 2011 09:02:51 +0000 (02:02 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Mon, 24 Oct 2011 03:20:58 +0000 (03:20 +0000)
commit8dc52b54207f361f7abf6cbe26f5199ae8b7cf23
tree71b328bf052940a44af314b1524a2a7a3765337e
parentd270190a75e5b859c6d8eed8d4095fbb45f78264
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>
drivers/target/target_core_tmr.c
drivers/target/target_core_transport.c
include/target/target_core_transport.h