drop nvme-auth-unlock-mutex-in-one-place-only.patch

diff --git a/queue-6.1/nvme-auth-set-explanation-code-for-failure2-msgs.patch b/queue-6.1/nvme-auth-set-explanation-code-for-failure2-msgs.patch
index b15a8cc920e4ca296160e8126733a11d1317835b..1352554d28c85781a15c2bb2213bf2bc891d94d4 100644 (file)
--- a/queue-6.1/nvme-auth-set-explanation-code-for-failure2-msgs.patch
+++ b/queue-6.1/nvme-auth-set-explanation-code-for-failure2-msgs.patch
@@ -17,14 +17,12 @@ Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
 Signed-off-by: Keith Busch <kbusch@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/nvme/host/auth.c | 2 ++
+ drivers/nvme/host/auth.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
-index 7c9dfb420c464..d67076e98b4bc 100644
 --- a/drivers/nvme/host/auth.c
 +++ b/drivers/nvme/host/auth.c
-@@ -835,6 +835,8 @@ static void nvme_queue_auth_work(struct work_struct *work)
+@@ -834,6 +834,8 @@ static void nvme_queue_auth_work(struct
        }
  
  fail2:
@@ -33,6 +31,3 @@ index 7c9dfb420c464..d67076e98b4bc 100644
        dev_dbg(ctrl->device, "%s: qid %d send failure2, status %x\n",
                __func__, chap->qid, chap->status);
        tl = nvme_auth_set_dhchap_failure2_data(ctrl, chap);
--- 
-2.43.0
-

diff --git a/queue-6.1/nvme-auth-unlock-mutex-in-one-place-only.patch b/queue-6.1/nvme-auth-unlock-mutex-in-one-place-only.patch
deleted file mode 100644 (file)
index c33492b..0000000
--- a/queue-6.1/nvme-auth-unlock-mutex-in-one-place-only.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e85d53548a98fef7933fc10ff03f588037cafaf9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 11 Oct 2023 08:45:11 +0000
-Subject: nvme-auth: unlock mutex in one place only
-
-From: Mark O'Donovan <shiftee@posteo.net>
-
-[ Upstream commit 616add70bfdc0274a253e84fc78155c27aacde91 ]
-
-Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/host/auth.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
-index 9dfd3d0293054..7c9dfb420c464 100644
---- a/drivers/nvme/host/auth.c
-+++ b/drivers/nvme/host/auth.c
-@@ -758,6 +758,7 @@ static void nvme_queue_auth_work(struct work_struct *work)
-       dev_dbg(ctrl->device, "%s: qid %d host response\n",
-               __func__, chap->qid);
-       ret = nvme_auth_dhchap_setup_host_response(ctrl, chap);
-+      mutex_unlock(&ctrl->dhchap_auth_mutex);
-       if (ret) {
-               chap->error = ret;
-               goto fail2;
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 426e82111f2999103f1f51cebe0de5d888eb9592..e4039758ed664d352821b5bd189b56299a040f87 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -61,7 +61,6 @@ bcache-remove-redundant-assignment-to-variable-cur_i.patch
 bcache-add-code-comments-for-bch_btree_node_get-and-.patch
 bcache-avoid-null-checking-to-c-root-in-run_cache_se.patch
 nbd-fold-nbd-config-initialization-into-nbd_alloc_co.patch
-nvme-auth-unlock-mutex-in-one-place-only.patch
 nvme-auth-set-explanation-code-for-failure2-msgs.patch
 nvme-catch-errors-from-nvme_configure_metadata.patch
 selftests-bpf-fix-bpf_loop_bench-for-new-callback-ve.patch

diff --git a/queue-6.6/nvme-auth-set-explanation-code-for-failure2-msgs.patch b/queue-6.6/nvme-auth-set-explanation-code-for-failure2-msgs.patch
index 23b22e7262172e32571959170beea04d283be462..32f8ec97196f519217d7cfecd64dc99c3beadec4 100644 (file)
--- a/queue-6.6/nvme-auth-set-explanation-code-for-failure2-msgs.patch
+++ b/queue-6.6/nvme-auth-set-explanation-code-for-failure2-msgs.patch
@@ -17,14 +17,12 @@ Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
 Signed-off-by: Keith Busch <kbusch@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/nvme/host/auth.c | 2 ++
+ drivers/nvme/host/auth.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
-index cc02a95a50c9a..a31080b7fd7de 100644
 --- a/drivers/nvme/host/auth.c
 +++ b/drivers/nvme/host/auth.c
-@@ -839,6 +839,8 @@ static void nvme_queue_auth_work(struct work_struct *work)
+@@ -840,6 +840,8 @@ static void nvme_queue_auth_work(struct
        }
  
  fail2:
@@ -33,6 +31,3 @@ index cc02a95a50c9a..a31080b7fd7de 100644
        dev_dbg(ctrl->device, "%s: qid %d send failure2, status %x\n",
                __func__, chap->qid, chap->status);
        tl = nvme_auth_set_dhchap_failure2_data(ctrl, chap);
--- 
-2.43.0
-

diff --git a/queue-6.6/nvme-auth-unlock-mutex-in-one-place-only.patch b/queue-6.6/nvme-auth-unlock-mutex-in-one-place-only.patch
deleted file mode 100644 (file)
index 1da180f..0000000
--- a/queue-6.6/nvme-auth-unlock-mutex-in-one-place-only.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4a83ca57595f9a95efc27c396ecb08f4286bf92e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 11 Oct 2023 08:45:11 +0000
-Subject: nvme-auth: unlock mutex in one place only
-
-From: Mark O'Donovan <shiftee@posteo.net>
-
-[ Upstream commit 616add70bfdc0274a253e84fc78155c27aacde91 ]
-
-Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
-Reviewed-by: Christoph Hellwig <hch@lst.de>
-Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/host/auth.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
-index 064592a5d546a..cc02a95a50c9a 100644
---- a/drivers/nvme/host/auth.c
-+++ b/drivers/nvme/host/auth.c
-@@ -758,12 +758,11 @@ static void nvme_queue_auth_work(struct work_struct *work)
-               __func__, chap->qid);
-       mutex_lock(&ctrl->dhchap_auth_mutex);
-       ret = nvme_auth_dhchap_setup_host_response(ctrl, chap);
-+      mutex_unlock(&ctrl->dhchap_auth_mutex);
-       if (ret) {
--              mutex_unlock(&ctrl->dhchap_auth_mutex);
-               chap->error = ret;
-               goto fail2;
-       }
--      mutex_unlock(&ctrl->dhchap_auth_mutex);
- 
-       /* DH-HMAC-CHAP Step 3: send reply */
-       dev_dbg(ctrl->device, "%s: qid %d send reply\n",
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 19c75910d3b013335a188e1dbadd2bda3a2a711f..9b3d5457558fcc28d1455a8196f4be7ceec697a9 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -95,7 +95,6 @@ bcache-avoid-null-checking-to-c-root-in-run_cache_se.patch
 nbd-fold-nbd-config-initialization-into-nbd_alloc_co.patch
 nbd-factor-out-a-helper-to-get-nbd_config-without-ho.patch
 nbd-fix-null-ptr-dereference-while-accessing-nbd-con.patch
-nvme-auth-unlock-mutex-in-one-place-only.patch
 nvme-auth-set-explanation-code-for-failure2-msgs.patch
 nvme-catch-errors-from-nvme_configure_metadata.patch
 selftests-bpf-fix-bpf_loop_bench-for-new-callback-ve.patch