From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Date: Tue, 11 Aug 2015 22:22:22 +0000 (-0300)
Subject: dlm: fix not reconnecting on connecting error handling
X-Git-Tag: firefly_0821_release~176^2~1155^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=356344c4c36dc960f90a3457dd67fe2efcf92417;p=firefly-linux-kernel-4.4.55.git

dlm: fix not reconnecting on connecting error handling

If we don't clear that bit, lowcomms_connect_sock() will not schedule
another attempt, and no further attempt will be done.

Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 749deb3b69b2..54a0031067de 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1253,6 +1253,7 @@ out_err:
 			  con->retries, result);
 		mutex_unlock(&con->sock_mutex);
 		msleep(1000);
+		clear_bit(CF_CONNECT_PENDING, &con->flags);
 		lowcomms_connect_sock(con);
 		return;
 	}