From: tsutomu.owa@toshiba.co.jp <tsutomu.owa@toshiba.co.jp>
Date: Tue, 12 Sep 2017 09:01:24 +0000 (+0000)
Subject: DLM: use CF_CLOSE flag to stop dlm_send correctly
X-Git-Tag: v4.15-rc1~132^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=173a31fe2b23b3ccc45d0b70edb225b1d836c31d;p=thirdparty%2Flinux.git

DLM: use CF_CLOSE flag to stop dlm_send correctly

If reconnection fails while executing dlm_lowcomms_stop,
dlm_send will not stop.

Signed-off-by: Tadashi Miyauchi <miyauchi@toshiba-tops.co.jp>
Signed-off-by: Tsutomu Owa <tsutomu.owa@toshiba.co.jp>
Signed-off-by: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 306b5fe0866fc..215515198edb2 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1643,6 +1643,7 @@ static int work_start(void)
 static void _stop_conn(struct connection *con, bool and_other)
 {
 	mutex_lock(&con->sock_mutex);
+	set_bit(CF_CLOSE, &con->flags);
 	set_bit(CF_READ_PENDING, &con->flags);
 	set_bit(CF_WRITE_PENDING, &con->flags);
 	if (con->sock && con->sock->sk)