Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1606761
| From | John Garry <john.garry@huawei.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 14/23] scsi: hisi_sas: remove task free'ing for timeouts |
| Date | 2017-03-22 18:10 +0100 |
| Message-ID | <tnRVM-5RD-21@gated-at.bofh.it> (permalink) |
| References | <tnRM5-5ys-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
When a TMF or internal abort times-out, do not free
slot. We expect this to be done upon later escalated
error handling.
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/hisi_sas/hisi_sas_main.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index f9ea5cc..3d63a24 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -743,14 +743,6 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,
if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
dev_err(dev, "abort tmf: TMF task timeout\n");
- if (task->lldd_task) {
- struct hisi_sas_slot *slot =
- task->lldd_task;
-
- hisi_sas_slot_task_free(hisi_hba,
- task, slot);
- }
-
goto ex_err;
}
}
@@ -1248,15 +1240,10 @@ static int hisi_sas_query_task(struct sas_task *task)
goto exit;
}
- /* TMF timed out, return direct. */
+ /* Internal abort timed out */
if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
dev_err(dev, "internal task abort: timeout.\n");
- if (task->lldd_task) {
- struct hisi_sas_slot *slot = task->lldd_task;
-
- hisi_sas_slot_task_free(hisi_hba, task, slot);
- }
}
}
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/23] hisi_sas: error handling and other misc fixes and improvements John Garry <john.garry@huawei.com> - 2017-03-22 18:00 +0100 [PATCH 13/23] scsi: hisi_sas: fix some sas_task.task_state_lock locking John Garry <john.garry@huawei.com> - 2017-03-22 18:00 +0100 [PATCH 12/23] scsi: hisi_sas: free slots after hardreset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 10/23] scsi: hisi_sas: hardreset for SATA disk in LU reset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 09/23] scsi: hisi_sas: modify hisi_sas_abort_task() for SSP John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 14/23] scsi: hisi_sas: remove task free'ing for timeouts John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 06/23] scsi: hisi_sas: error hisi_sas_task_prep() when port down John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 15/23] scsi: hisi_sas: process error codes according to their priority John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 02/23] scsi: hisi_sas: add controller reset John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 19/23] scsi: hisi_sas: add hisi_sas_clear_nexus_ha() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 22/23] scsi: hisi_sas: use dev_is_sata to identify SATA or SAS disk John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 17/23] scsi: hisi_sas: handle PHY UP+DOWN simultaneous irq John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 05/23] scsi: hisi_sas: remove hisi_sas_port_deformed() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 16/23] scsi: hisi_sas: some modifications to v2 hw reg init values John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 04/23] scsi: hisi_sas: add softreset function for SATA disk John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 20/23] scsi: hisi_sas: release SMP slot in lldd_abort_task John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 [PATCH 03/23] scsi: hisi_sas: move PHY init to hisi_sas_scan_start() John Garry <john.garry@huawei.com> - 2017-03-22 18:10 +0100 Re: [PATCH 00/23] hisi_sas: error handling and other misc fixes and improvements "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-03-23 16:20 +0100
csiph-web