drop queue-6.0/nvmet-auth-clean-up-with-done_kfree.patch

diff --git a/queue-6.0/nvmet-auth-clean-up-with-done_kfree.patch b/queue-6.0/nvmet-auth-clean-up-with-done_kfree.patch
deleted file mode 100644 (file)
index 0051991..0000000
--- a/queue-6.0/nvmet-auth-clean-up-with-done_kfree.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eb2bf72634a2cbb8f38caca20fdfd0c49f837916 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 12 Aug 2022 11:12:30 +0800
-Subject: nvmet-auth: clean up with done_kfree
-
-From: Jackie Liu <liuyun01@kylinos.cn>
-
-[ Upstream commit 42147981561c3344d2c6781fe7029e5900daa9fb ]
-
-Jump directly to done_kfree to release d, which is consistent with the
-code style behind.
-
-Reported-by: Genjian Zhang <zhanggenjian@kylinos.cn>
-Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
-Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
-Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/target/fabrics-cmd-auth.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
-index 0c078b6b1447..2c265504b87c 100644
---- a/drivers/nvme/target/fabrics-cmd-auth.c
-+++ b/drivers/nvme/target/fabrics-cmd-auth.c
-@@ -224,10 +224,8 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
-       }
- 
-       status = nvmet_copy_from_sgl(req, 0, d, tl);
--      if (status) {
--              kfree(d);
--              goto done;
--      }
-+      if (status)
-+              goto done_kfree;
- 
-       data = d;
-       pr_debug("%s: ctrl %d qid %d type %d id %d step %x\n", __func__,
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 1b1ba6f45dcf2393c8d978bcb4e1ba1bcc7e16ca..7786cea4d192af521c98d2dff30c55e447cb11f6 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -848,7 +848,6 @@ power-supply-adp5061-fix-out-of-bounds-read-in-adp50.patch
 staging-vt6655-fix-potential-memory-leak.patch
 blk-throttle-prevent-overflow-while-calculating-wait.patch
 ata-libahci_platform-sanity-check-the-dt-child-nodes.patch
-nvmet-auth-clean-up-with-done_kfree.patch
 bcache-fix-set_at_max_writeback_rate-for-multiple-at.patch
 soundwire-cadence-don-t-overwrite-msg-buf-during-wri.patch
 soundwire-intel-fix-error-handling-on-dai-registrati.patch