From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 14 Jun 2013 09:56:11 +0000 (-0500)
Subject: dlm: clear correct bit during sctp init failure handling
X-Git-Tag: firefly_0821_release~176^2~5849^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b390ca38d27bd3d2f409e64a6f13d6ff67eb4825;p=firefly-linux-kernel-4.4.55.git

dlm: clear correct bit during sctp init failure handling

We should be testing and cleaing the init pending bit because later
when sctp_init_assoc is recalled it will be checking that it is not set
and set the bit.

We do not want to touch CF_CONNECT_PENDING here because we will queue
swork and process_send_sockets will then call the connect_action function.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 1536599fde8c..87e68dd01479 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -562,7 +562,7 @@ static void sctp_send_shutdown(sctp_assoc_t associd)
 static void sctp_init_failed_foreach(struct connection *con)
 {
 	con->sctp_assoc = 0;
-	if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {
+	if (test_and_clear_bit(CF_INIT_PENDING, &con->flags)) {
 		if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
 			queue_work(send_workqueue, &con->swork);
 	}