Skip to content

Commit

Permalink
target: fold se_task.task_sense into task_flags
Browse files Browse the repository at this point in the history
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 Dec 14, 2011
1 parent c4795fb commit ef804a8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ void transport_complete_task(struct se_task *task, int success)
if (dev && dev->transport->transport_complete) {
if (dev->transport->transport_complete(task) != 0) {
cmd->se_cmd_flags |= SCF_TRANSPORT_TASK_SENSE;
task->task_sense = 1;
task->task_flags |= TF_HAS_SENSE;
success = 1;
}
}
Expand Down Expand Up @@ -2346,7 +2346,7 @@ static int transport_get_sense_data(struct se_cmd *cmd)

list_for_each_entry_safe(task, task_tmp,
&cmd->t_task_list, t_list) {
if (!task->task_sense)
if (!(task->task_flags & TF_HAS_SENSE))
continue;

if (!dev->transport->get_sense_buffer) {
Expand Down
4 changes: 2 additions & 2 deletions include/target/target_core_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,12 @@ enum transport_tpg_type_table {
TRANSPORT_TPG_TYPE_DISCOVERY = 1,
};

/* Used for generate timer flags */
/* struct se_task->task_flags */
enum se_task_flags {
TF_ACTIVE = (1 << 0),
TF_SENT = (1 << 1),
TF_REQUEST_STOP = (1 << 2),
TF_HAS_SENSE = (1 << 3),
};

/* Special transport agnostic struct se_cmd->t_states */
Expand Down Expand Up @@ -488,7 +489,6 @@ struct se_task {
struct scatterlist *task_sg;
u32 task_sg_nents;
u16 task_flags;
u8 task_sense;
u8 task_scsi_status;
int task_error_status;
enum dma_data_direction task_data_direction;
Expand Down

0 comments on commit ef804a8

Please sign in to comment.