diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-11-23 06:53:58 -0500 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-12-14 11:26:27 +0000 |
| commit | ef804a849ffae058a783e9dddd24cc1a555bbdb4 (patch) | |
| tree | e67737300936c2b94359ded96d9113981cb610aa | |
| parent | c4795fb20edf2fe2c862c8fe9f8b681edeb79ac1 (diff) | |
| download | linux-stable-ef804a849ffae058a783e9dddd24cc1a555bbdb4.tar.gz linux-stable-ef804a849ffae058a783e9dddd24cc1a555bbdb4.tar.bz2 linux-stable-ef804a849ffae058a783e9dddd24cc1a555bbdb4.zip | |
target: fold se_task.task_sense into task_flags
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
| -rw-r--r-- | drivers/target/target_core_transport.c | 4 | ||||
| -rw-r--r-- | include/target/target_core_base.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 72c13b7a349f..e13fafa6f526 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -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; } } @@ -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) { diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 1d90fb33e60b..7f3acdde97de 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -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 */ @@ -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; |