[Cluster-devel] [PATCH AUTOSEL 5.12 15/52] fs: dlm: cancel work sync othercon

Sasha Levin sashal at kernel.org
Mon Jul 5 15:28:36 UTC 2021

From: Alexander Aring <aahringo at redhat.com>

[ Upstream commit c6aa00e3d20c2767ba3f57b64eb862572b9744b3 ]

These rx tx flags arguments are for signaling close_connection() from
which worker they are called. Obviously the receive worker cannot cancel
itself and vice versa for swork. For the othercon the receive worker
should only be used, however to avoid deadlocks we should pass the same
flags as the original close_connection() was called.

Signed-off-by: Alexander Aring <aahringo at redhat.com>
Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Sasha Levin <sashal at kernel.org>
 fs/dlm/lowcomms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 01b672cee783..7e6736c70e11 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -714,7 +714,7 @@ static void close_connection(struct connection *con, bool and_other,
 	if (con->othercon && and_other) {
 		/* Will only re-enter once. */
-		close_connection(con->othercon, false, true, true);
+		close_connection(con->othercon, false, tx, rx);
 	con->rx_leftover = 0;

More information about the Cluster-devel mailing list