diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 19:40:23 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 19:40:23 -0400 |
| commit | ebb239eb8dc3b2538cd2354381c6f46d92de8293 (patch) | |
| tree | 7d1db9c8a17bb0b5fe516176e1ae1157b83fc0f0 | |
| parent | f41842c3d46da781e372fbb22fdaeaf482ab5ce8 (diff) | |
| download | longterm-queue-4.12-ebb239eb8dc3b2538cd2354381c6f46d92de8293.tar.gz | |
scsi: refresh for extra blank line removal
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/queue/scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch b/queue/scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch index f8c68ab..c04161d 100644 --- a/queue/scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch +++ b/queue/scsi-hisi_sas-fix-the-risk-of-freeing-slot-twice.patch @@ -1,4 +1,4 @@ -From 6ba0fbc35aa9f3bc8c12be3b4047055c9ce2ac92 Mon Sep 17 00:00:00 2001 +From 3a85b595fcd05d391390ceca72921e71851ceb8f Mon Sep 17 00:00:00 2001 From: Xiaofei Tan <tanxiaofei@huawei.com> Date: Tue, 24 Oct 2017 23:51:38 +0800 Subject: [PATCH] scsi: hisi_sas: fix the risk of freeing slot twice @@ -27,12 +27,13 @@ This patch is to fix this risk of freeing slot twice, as follows: Signed-off-by: Xiaofei Tan <tanxiaofei@huawei.com> Signed-off-by: John Garry <john.garry@huawei.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c -index 2a209e1ea76b..6b4dabdeb4a9 100644 +index d622db502ec9..a498076282b3 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c -@@ -185,13 +185,16 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, +@@ -83,13 +83,16 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, struct domain_device *device = task->dev; struct hisi_sas_device *sas_dev = device->lldd_dev; @@ -51,11 +52,9 @@ index 2a209e1ea76b..6b4dabdeb4a9 100644 if (sas_dev) atomic64_dec(&sas_dev->running_req); } -@@ -199,8 +202,8 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, - if (slot->buf) - dma_pool_free(hisi_hba->buffer_pool, slot->buf, slot->buf_dma); +@@ -107,6 +110,7 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task, + slot->sge_page_dma); -- list_del_init(&slot->entry); + slot->buf = NULL; slot->task = NULL; |