summaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authortsutomu.owa@toshiba.co.jp <tsutomu.owa@toshiba.co.jp>2017-09-12 09:01:24 +0000
committerDavid Teigland <teigland@redhat.com>2017-09-25 12:45:21 -0500
commit173a31fe2b23b3ccc45d0b70edb225b1d836c31d (patch)
tree6cd0c449240b64c4a5ab23bd2df18bbb96d26e17 /fs/dlm
parent8a4abb0819769a556f9023845d3821a06f81452d (diff)
downloadlinux-173a31fe2b23b3ccc45d0b70edb225b1d836c31d.tar.bz2
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>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lowcomms.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 306b5fe0866f..215515198edb 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)