Skip to content

Commit

Permalink
target: remove the t_task_cdbs_ex_left field in struct se_cmd
Browse files Browse the repository at this point in the history
Now that tasks are gone we are guaranteed to only get a single completion
per command, and thus don't need this counter.

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 May 6, 2012
1 parent 226b6fa commit d43d6ae
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 14 deletions.
7 changes: 0 additions & 7 deletions drivers/target/target_core_tmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,6 @@ static void core_tmr_drain_state_list(
spin_lock_irqsave(&cmd->t_state_lock, flags);
target_stop_cmd(cmd, &flags);

if (!atomic_dec_and_test(&cmd->t_task_cdbs_ex_left)) {
spin_unlock_irqrestore(&cmd->t_state_lock, flags);
pr_debug("LUN_RESET: Skipping cmd: %p, dev: %p for"
" t_task_cdbs_ex_left: %d\n", cmd, dev,
atomic_read(&cmd->t_task_cdbs_ex_left));
continue;
}
fe_count = atomic_read(&cmd->t_fe_count);

if (!(cmd->transport_state & CMD_T_ACTIVE)) {
Expand Down
7 changes: 1 addition & 6 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,6 @@ static void target_remove_from_state_list(struct se_cmd *cmd)
spin_lock_irqsave(&dev->execute_task_lock, flags);
if (cmd->state_active) {
list_del(&cmd->state_list);
atomic_dec(&cmd->t_task_cdbs_ex_left);
cmd->state_active = false;
}
spin_unlock_irqrestore(&dev->execute_task_lock, flags);
Expand Down Expand Up @@ -1771,9 +1770,7 @@ void transport_generic_request_failure(struct se_cmd *cmd)
pr_debug("-----[ i_state: %d t_state: %d scsi_sense_reason: %d\n",
cmd->se_tfo->get_cmd_state(cmd),
cmd->t_state, cmd->scsi_sense_reason);
pr_debug("-----[ t_task_cdbs_ex_left: %d --"
" CMD_T_ACTIVE: %d CMD_T_STOP: %d CMD_T_SENT: %d\n",
atomic_read(&cmd->t_task_cdbs_ex_left),
pr_debug("-----[ CMD_T_ACTIVE: %d CMD_T_STOP: %d CMD_T_SENT: %d\n",
(cmd->transport_state & CMD_T_ACTIVE) != 0,
(cmd->transport_state & CMD_T_STOP) != 0,
(cmd->transport_state & CMD_T_SENT) != 0);
Expand Down Expand Up @@ -3503,8 +3500,6 @@ int transport_generic_new_cmd(struct se_cmd *cmd)
atomic_inc(&cmd->t_fe_count);
atomic_inc(&cmd->t_se_count);

atomic_set(&cmd->t_task_cdbs_ex_left, 1);

/*
* For WRITEs, let the fabric know its buffer is ready.
*
Expand Down
1 change: 0 additions & 1 deletion include/target/target_core_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,6 @@ struct se_cmd {
unsigned long long t_task_lba;
atomic_t t_fe_count;
atomic_t t_se_count;
atomic_t t_task_cdbs_ex_left;
unsigned int transport_state;
#define CMD_T_ABORTED (1 << 0)
#define CMD_T_ACTIVE (1 << 1)
Expand Down

0 comments on commit d43d6ae

Please sign in to comment.