Drop scsi-elx-efct-delete-stray-unlock-statement.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.14/scsi-elx-efct-delete-stray-unlock-statement.patch b/queue-5.14/scsi-elx-efct-delete-stray-unlock-statement.patch
deleted file mode 100644 (file)
index 8ffa068..0000000
--- a/queue-5.14/scsi-elx-efct-delete-stray-unlock-statement.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From b4acaa8e2a1a8b7dd174b447065a7f190908c8df Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 4 Oct 2021 13:38:51 +0300
-Subject: scsi: elx: efct: Delete stray unlock statement
-
-From: Dan Carpenter <dan.carpenter@oracle.com>
-
-[ Upstream commit a013c71c6315d6e9d6364d12251b98c75c9a2861 ]
-
-It's not holding the lock at this stage and the IRQ "flags" are not correct
-so it would restore something bogus. Delete the unlock statement.
-
-Link: https://lore.kernel.org/r/20211004103851.GE25015@kili
-Fixes: 3e6414003bf9 ("scsi: elx: efct: SCSI I/O handling routines")
-Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/scsi/elx/efct/efct_scsi.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/scsi/elx/efct/efct_scsi.c b/drivers/scsi/elx/efct/efct_scsi.c
-index 40fb3a724c76..cf2e41dd354c 100644
---- a/drivers/scsi/elx/efct/efct_scsi.c
-+++ b/drivers/scsi/elx/efct/efct_scsi.c
-@@ -32,7 +32,7 @@ efct_scsi_io_alloc(struct efct_node *node)
-       struct efct *efct;
-       struct efct_xport *xport;
-       struct efct_io *io;
--      unsigned long flags = 0;
-+      unsigned long flags;
- 
-       efct = node->efct;
- 
-@@ -44,7 +44,6 @@ efct_scsi_io_alloc(struct efct_node *node)
-       if (!io) {
-               efc_log_err(efct, "IO alloc Failed\n");
-               atomic_add_return(1, &xport->io_alloc_failed_count);
--              spin_unlock_irqrestore(&node->active_ios_lock, flags);
-               return NULL;
-       }
- 
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index 6a3bfe688322a96177cfd8cb08b206017b51fb64..e9cb85f57a9962592884f0f920ddfd8d68a526a6 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -127,7 +127,6 @@ bpf-s390-fix-potential-memory-leak-about-jit_data.patch
 i2c-mlxcpld-fix-criteria-for-frequency-setting.patch
 i2c-mlxcpld-modify-register-setting-for-400khz-frequ.patch
 risc-v-include-clone3-on-rv32.patch
-scsi-elx-efct-delete-stray-unlock-statement.patch
 scsi-iscsi-fix-iscsi_task-use-after-free.patch
 objtool-remove-reloc-symbol-type-checks-in-get_alt_e.patch
 objtool-make-.altinstructions-section-entry-size-con.patch