From cd29799299c95cf00cb02d40e1d40b92fbd2aaea Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 23 Nov 2011 06:54:15 -0500 Subject: [PATCH] --- yaml --- r: 286511 b: refs/heads/master c: 41e16e981679124c78c30f046d4f0b71d86ff1b2 h: refs/heads/master i: 286509: 753993c3c1e527566f9dfcb9543048801ef11cb5 286507: 6dbbd7ee32654931042d0b3d901fa712938f192c 286503: 592e9eaa3d584cb0c11c324997531ac2bd1ea83e 286495: 0ee7a02da45e8628246270a295682cf5360b38e5 v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_transport.c | 8 +------- trunk/include/target/target_core_base.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 171cd5d6b121..2cf3c6ea657e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef804a849ffae058a783e9dddd24cc1a555bbdb4 +refs/heads/master: 41e16e981679124c78c30f046d4f0b71d86ff1b2 diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c index e13fafa6f526..ae112ac91c47 100644 --- a/trunk/drivers/target/target_core_transport.c +++ b/trunk/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/trunk/include/target/target_core_base.h b/trunk/include/target/target_core_base.h index 7f3acdde97de..e2473e6770b3 100644 --- a/trunk/include/target/target_core_base.h +++ b/trunk/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;