Instead of duplicating the code from transport_release_fe_cmd re-use it by
allowing transport_release_fe_cmd to return wether it actually freed the
command or not. Also rename transport_release_fe_cmd to transport_put_cmd
and add a kerneldoc comment for it to make the use case more obvious.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: lio-core/drivers/target/target_core_transport.c
===================================================================
--- lio-core.orig/drivers/target/target_core_transport.c 2011-09-13 14:46:28.933088957 -0400
+++ lio-core/drivers/target/target_core_transport.c 2011-09-13 14:49:01.575590416 -0400
@@ -90,7 +90,7 @@ static u32 transport_allocate_tasks(stru
static int transport_generic_get_mem(struct se_cmd *cmd);
static int transport_generic_remove(struct se_cmd *cmd,
int session_reinstatement);
-static void transport_release_fe_cmd(struct se_cmd *cmd);
+static bool transport_put_cmd(struct se_cmd *cmd);
static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
struct se_queue_obj *qobj);
static int transport_set_sense_codes(struct se_cmd *cmd, u8 asc, u8 ascq);
@@ -1078,7 +1078,7 @@ static void transport_release_all_cmds(s
cmd->se_tfo->get_task_tag(cmd),
cmd->se_tfo->get_cmd_state(cmd), t_state);
- transport_release_fe_cmd(cmd);
+ transport_put_cmd(cmd);
bug_out = 1;
spin_lock_irqsave(&dev->dev_queue_obj.cmd_queue_lock, flags);
@@ -3784,12 +3784,18 @@ static inline int transport_dec_and_chec
return 0;
}
-static void transport_release_fe_cmd(struct se_cmd *cmd)
+/**
+ * transport_put_cmd - release a reference to a command
+ * @cmd: command to release
+ *
+ * This routine releases our reference to the command and frees it if possible.
+ */
+static bool transport_put_cmd(struct se_cmd *cmd)
{
unsigned long flags;
if (transport_dec_and_check(cmd))
- return;
+ return false;
spin_lock_irqsave(&cmd->t_state_lock, flags);
if (!atomic_read(&cmd->transport_dev_active)) {
@@ -3801,9 +3807,12 @@ static void transport_release_fe_cmd(str
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
transport_release_tasks(cmd);
+ return true;
+
free_pages:
transport_free_pages(cmd);
transport_release_cmd(cmd);
+ return true;
}
static int
@@ -3811,7 +3820,7 @@ transport_generic_remove(struct se_cmd *
{
unsigned long flags;
- if (transport_dec_and_check(cmd)) {
+ if (!transport_put_cmd(cmd)) {
if (session_reinstatement) {
spin_lock_irqsave(&cmd->t_state_lock, flags);
transport_all_task_dev_remove_state(cmd);
@@ -3821,20 +3830,6 @@ transport_generic_remove(struct se_cmd *
return 1;
}
- spin_lock_irqsave(&cmd->t_state_lock, flags);
- if (!atomic_read(&cmd->transport_dev_active)) {
- spin_unlock_irqrestore(&cmd->t_state_lock, flags);
- goto free_pages;
- }
- atomic_set(&cmd->transport_dev_active, 0);
- transport_all_task_dev_remove_state(cmd);
- spin_unlock_irqrestore(&cmd->t_state_lock, flags);
-
- transport_release_tasks(cmd);
-
-free_pages:
- transport_free_pages(cmd);
- transport_release_cmd(cmd);
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
