fs: dlm: be sure to call dlm_send_queue_flush()

[ Upstream commit 557856c7140be71b8c765934d7db78996890b893 ]

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.

Cc: stable@vger.kernel.org
Fixes: 9c99c76781ff ("fs: dlm: add reliable connection if reconnect")
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/dlm/midcomms.c b/fs/dlm/midcomms.c
index b53d7a281be93623faec40244f93ebd870a08692..d976c2009b185ad72712ed03405738040f3a6a4b 100644 (file)
--- a/fs/dlm/midcomms.c
+++ b/fs/dlm/midcomms.c
@@ -1367,6 +1367,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);
 }