From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Mon, 18 Nov 2019 23:55:45 -0500
Subject: Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
Git-commit: 5a993e507ee65a28eca6690ee11868555c4ca46b
Patch-mainline: 5.5-rc1
References: bnc#1151927 5.3.17
This reverts commit 2f856d4e8c23f5ad5221f8da4a2f22d090627f19.
This patch was found to introduce a double free regression. The issue
it originally attempted to address was fixed in patch
f45bca8c5052 ("scsi: qla2xxx: Fix double scsi_done for abort path").
Link: https://lore.kernel.org/r/4BDE2B95-835F-43BE-A32C-2629D7E03E0A@marvell.com
Requested-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/scsi/qla2xxx/qla_os.c | 4 ----
1 file changed, 4 deletions(-)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -909,8 +909,6 @@ qla2xxx_queuecommand(struct Scsi_Host *h
qc24_host_busy_free_sp:
sp->free(sp);
- CMD_SP(cmd) = NULL;
- qla2x00_rel_sp(sp);
qc24_target_busy:
return SCSI_MLQUEUE_TARGET_BUSY;
@@ -994,8 +992,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *
qc24_host_busy_free_sp:
sp->free(sp);
- CMD_SP(cmd) = NULL;
- qla2xxx_rel_qpair_sp(sp->qpair, sp);
qc24_target_busy:
return SCSI_MLQUEUE_TARGET_BUSY;