target: simplify core_tmr_release_req()

And while at it, do minimal coding style fixes in the area.

Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Joern Engel 2014-09-16 16:23:10 -04:00 committed by Nicholas Bellinger
parent 9c7d6154bc
commit 8f83269048
1 changed files with 7 additions and 12 deletions

View File

@ -64,21 +64,17 @@ int core_tmr_alloc_req(
} }
EXPORT_SYMBOL(core_tmr_alloc_req); EXPORT_SYMBOL(core_tmr_alloc_req);
void core_tmr_release_req( void core_tmr_release_req(struct se_tmr_req *tmr)
struct se_tmr_req *tmr)
{ {
struct se_device *dev = tmr->tmr_dev; struct se_device *dev = tmr->tmr_dev;
unsigned long flags; unsigned long flags;
if (!dev) { if (dev) {
kfree(tmr); spin_lock_irqsave(&dev->se_tmr_lock, flags);
return; list_del(&tmr->tmr_list);
spin_unlock_irqrestore(&dev->se_tmr_lock, flags);
} }
spin_lock_irqsave(&dev->se_tmr_lock, flags);
list_del(&tmr->tmr_list);
spin_unlock_irqrestore(&dev->se_tmr_lock, flags);
kfree(tmr); kfree(tmr);
} }
@ -90,9 +86,8 @@ static void core_tmr_handle_tas_abort(
bool remove = true; bool remove = true;
/* /*
* TASK ABORTED status (TAS) bit support * TASK ABORTED status (TAS) bit support
*/ */
if ((tmr_nacl && if ((tmr_nacl && (tmr_nacl != cmd->se_sess->se_node_acl)) && tas) {
(tmr_nacl != cmd->se_sess->se_node_acl)) && tas) {
remove = false; remove = false;
transport_send_task_abort(cmd); transport_send_task_abort(cmd);
} }