48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
||
|
|
Date: Thu, 3 Dec 2020 07:45:18 +0100
|
||
|
|
Subject: [PATCH] Revert "scsi: be2iscsi: Fix a theoretical leak in
|
||
|
|
beiscsi_create_eqs()"
|
||
|
|
|
||
|
|
This reverts commit 552b270b5784dc322807df89eb359e74fc570fde.
|
||
|
|
---
|
||
|
|
drivers/scsi/be2iscsi/be_main.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
|
||
|
|
index 0fa455357594..0760d0bd8a10 100644
|
||
|
|
--- a/drivers/scsi/be2iscsi/be_main.c
|
||
|
|
+++ b/drivers/scsi/be2iscsi/be_main.c
|
||
|
|
@@ -3020,7 +3020,6 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
|
||
|
|
goto create_eq_error;
|
||
|
|
}
|
||
|
|
|
||
|
|
- mem->dma = paddr;
|
||
|
|
mem->va = eq_vaddress;
|
||
|
|
ret = be_fill_queue(eq, phba->params.num_eq_entries,
|
||
|
|
sizeof(struct be_eq_entry), eq_vaddress);
|
||
|
|
@@ -3030,6 +3029,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
|
||
|
|
goto create_eq_error;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ mem->dma = paddr;
|
||
|
|
ret = beiscsi_cmd_eq_create(&phba->ctrl, eq,
|
||
|
|
BEISCSI_EQ_DELAY_DEF);
|
||
|
|
if (ret) {
|
||
|
|
@@ -3086,7 +3086,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
|
||
|
|
goto create_cq_error;
|
||
|
|
}
|
||
|
|
|
||
|
|
- mem->dma = paddr;
|
||
|
|
ret = be_fill_queue(cq, phba->params.num_cq_entries,
|
||
|
|
sizeof(struct sol_cqe), cq_vaddress);
|
||
|
|
if (ret) {
|
||
|
|
@@ -3096,6 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
|
||
|
|
goto create_cq_error;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ mem->dma = paddr;
|
||
|
|
ret = beiscsi_cmd_cq_create(&phba->ctrl, cq, eq, false,
|
||
|
|
false, 0);
|
||
|
|
if (ret) {
|