summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-11-23 06:54:15 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2011-12-14 11:26:44 +0000
commit41e16e981679124c78c30f046d4f0b71d86ff1b2 (patch)
tree2db886814e0f8b9b39d8e8b836e3598d128d14e1
parentef804a849ffae058a783e9dddd24cc1a555bbdb4 (diff)
downloadlinux-stable-41e16e981679124c78c30f046d4f0b71d86ff1b2.tar.gz
linux-stable-41e16e981679124c78c30f046d4f0b71d86ff1b2.tar.bz2
linux-stable-41e16e981679124c78c30f046d4f0b71d86ff1b2.zip
target: remove the se_task task_error_status field
We only reach transport_complete_task once per task, so the test and set on task_error_status is never going to have an effect. 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.c8
-rw-r--r--include/target/target_core_base.h1
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index e13fafa6f526..ae112ac91c47 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -738,13 +738,7 @@ void transport_complete_task(struct se_task *task, int success)
}
if (cmd->t_tasks_failed) {
- if (!task->task_error_status) {
- task->task_error_status =
- TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
- cmd->scsi_sense_reason =
- TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
- }
-
+ cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
INIT_WORK(&cmd->work, target_complete_failure_work);
} else {
atomic_set(&cmd->t_transport_complete, 1);
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 7f3acdde97de..e2473e6770b3 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -490,7 +490,6 @@ struct se_task {
u32 task_sg_nents;
u16 task_flags;
u8 task_scsi_status;
- int task_error_status;
enum dma_data_direction task_data_direction;
atomic_t task_state_active;
struct list_head t_list;