drop queue-4.19/cifs-fix-oops-due-to-uncleared-server-smbd_conn-in-reconnect.patch

diff --git a/queue-4.19/cifs-fix-oops-due-to-uncleared-server-smbd_conn-in-reconnect.patch b/queue-4.19/cifs-fix-oops-due-to-uncleared-server-smbd_conn-in-reconnect.patch
deleted file mode 100644 (file)
index aa886ee..0000000
--- a/queue-4.19/cifs-fix-oops-due-to-uncleared-server-smbd_conn-in-reconnect.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b7ab9161cf5ddc42a288edf9d1a61f3bdffe17c7 Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Wed, 25 Jan 2023 14:02:13 +0000
-Subject: cifs: Fix oops due to uncleared server->smbd_conn in reconnect
-
-From: David Howells <dhowells@redhat.com>
-
-commit b7ab9161cf5ddc42a288edf9d1a61f3bdffe17c7 upstream.
-
-In smbd_destroy(), clear the server->smbd_conn pointer after freeing the
-smbd_connection struct that it points to so that reconnection doesn't get
-confused.
-
-Fixes: 8ef130f9ec27 ("CIFS: SMBD: Implement function to destroy a SMB Direct connection")
-Cc: stable@vger.kernel.org
-Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
-Acked-by: Tom Talpey <tom@talpey.com>
-Signed-off-by: David Howells <dhowells@redhat.com>
-Cc: Long Li <longli@microsoft.com>
-Cc: Pavel Shilovsky <piastryyy@gmail.com>
-Cc: Ronnie Sahlberg <lsahlber@redhat.com>
-Signed-off-by: Steve French <stfrench@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/cifs/smbdirect.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/fs/cifs/smbdirect.c
-+++ b/fs/cifs/smbdirect.c
-@@ -1493,6 +1493,7 @@ void smbd_destroy(struct smbd_connection
-       destroy_workqueue(info->workqueue);
-       log_rdma_event(INFO,  "rdma session destroyed\n");
-       kfree(info);
-+      server->smbd_conn = NULL;
- }
- 
- /*

diff --git a/queue-4.19/series b/queue-4.19/series
index 5dcd55c1224e2df8cd7a240f4d364bebce72a3ef..78639c807b4fa4b2a830780e4c4da26b07b95949 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -43,4 +43,3 @@ scsi-hpsa-fix-allocation-size-for-scsi_host_alloc.patch
 module-don-t-wait-for-going-modules.patch
 tracing-make-sure-trace_printk-can-output-as-soon-as-it-can-be-used.patch
 trace_events_hist-add-check-for-return-value-of-create_hist_field.patch
-cifs-fix-oops-due-to-uncleared-server-smbd_conn-in-reconnect.patch