FAILED: patch "[PATCH] fs: dlm: be sure to call dlm_send_queue_flush()" failed to apply to 5.15-stable tree

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 7354fa4ef697191effedc2ae9a8293427708bbf5
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

7354fa4ef697 ("fs: dlm: be sure to call dlm_send_queue_flush()") 775af207464b ("fs: dlm: use WARN_ON_ONCE() instead of WARN_ON()") e01c4b7bd415 ("fd: dlm: trace send/recv of dlm message and rcom") 00e99ccde757 ("dlm: use __le types for dlm messages") 2f9dbeda8dc0 ("dlm: use __le types for rcom messages") 3428785a65da ("dlm: use __le types for dlm header") a8449f232ee3 ("dlm: add __CHECKER__ for false positives") 6c547f264077 ("fs: dlm: memory cache for midcomms hotpath") 6c2e3bf68f3e ("fs: dlm: filter user dlm messages for kernel locks") 9af5b8f0ead7 ("fs: dlm: add debugfs rawmsg send functionality") 92732376fd29 ("fs: dlm: trace socket handling") f1d3b8f91d96 ("fs: dlm: initial support for tracepoints")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 7354fa4ef697191effedc2ae9a8293427708bbf5 Mon Sep 17 00:00:00 2001
From: Alexander Aring <[email protected]>
Date: Thu, 12 Jan 2023 17:10:33 -0500
Subject: [PATCH] fs: dlm: be sure to call dlm_send_queue_flush()

If we release a midcomms node structure, there should be nothing left inside the dlm midcomms send queue. However, sometimes this is not true because I believe some DLM_FIN message was not acked... if we run into a shutdown timeout, then we should be sure there is no pending send dlm message inside this queue when releasing midcomms node structure.

index 2e60d9a2c883..a3eb19c8cec5 100644
@@ -1402,6 +1402,7 @@ static void midcomms_node_release(struct rcu_head *rcu)
 	struct midcomms_node *node = container_of(rcu, struct midcomms_node, rcu);
 
 	WARN_ON_ONCE(atomic_read(&node->send_queue_cnt));
+	dlm_send_queue_flush(node);
 	kfree(node);
 }