Skip to content

Commit

Permalink
target: do not pass the queue object to transport_remove_cmd_from_queue
Browse files Browse the repository at this point in the history
We always operated on the same queue, so move finding it into the function,
just like we do for all other helpers operating on it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
  • Loading branch information
Christoph Hellwig authored and Nicholas Bellinger committed Oct 24, 2011
1 parent f7a5cc0 commit 3df8d40
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ static u32 transport_allocate_tasks(struct se_cmd *cmd,
struct scatterlist *sgl, unsigned int nents);
static int transport_generic_get_mem(struct se_cmd *cmd);
static void transport_put_cmd(struct se_cmd *cmd);
static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
struct se_queue_obj *qobj);
static void transport_remove_cmd_from_queue(struct se_cmd *cmd);
static int transport_set_sense_codes(struct se_cmd *cmd, u8 asc, u8 ascq);
static void transport_stop_all_task_timers(struct se_cmd *cmd);

Expand Down Expand Up @@ -591,7 +590,7 @@ void transport_cmd_finish_abort(struct se_cmd *cmd, int remove)
if (transport_cmd_check_stop_to_fabric(cmd))
return;
if (remove) {
transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj);
transport_remove_cmd_from_queue(cmd);
transport_put_cmd(cmd);
}
}
Expand Down Expand Up @@ -650,9 +649,9 @@ transport_get_cmd_from_queue(struct se_queue_obj *qobj)
return cmd;
}

static void transport_remove_cmd_from_queue(struct se_cmd *cmd,
struct se_queue_obj *qobj)
static void transport_remove_cmd_from_queue(struct se_cmd *cmd)
{
struct se_queue_obj *qobj = &cmd->se_dev->dev_queue_obj;
unsigned long flags;

spin_lock_irqsave(&qobj->cmd_queue_lock, flags);
Expand Down Expand Up @@ -4232,7 +4231,7 @@ static int transport_lun_wait_for_tasks(struct se_cmd *cmd, struct se_lun *lun)
pr_debug("ConfigFS: ITT[0x%08x] - stopped cmd....\n",
cmd->se_tfo->get_task_tag(cmd));
}
transport_remove_cmd_from_queue(cmd, &cmd->se_dev->dev_queue_obj);
transport_remove_cmd_from_queue(cmd);

return 0;
}
Expand Down

0 comments on commit 3df8d40

Please sign in to comment.