From b463c742d78146cc4b9e36f3cbc84d1e06e68b4d Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Thu, 20 Apr 2017 13:57:27 +0530
Subject: [PATCH 396/406] glusterd: set conn->reconnect to null on timer
 cancellation

>Reviewed-on: https://review.gluster.org/17088
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>

Change-Id: Ic48e6652f431daeb0db027660f6c9de16d893f08
BUG: 1443123
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/104115
---
 xlators/mgmt/glusterd/src/glusterd-utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 53ade93..100c6fd 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -1865,6 +1865,7 @@ glusterd_volume_start_glusterfs (glusterd_volinfo_t  *volinfo,
                 pthread_mutex_lock (&conn->lock);
                 if (conn->reconnect) {
                         (void ) gf_timer_call_cancel (rpc->ctx, conn->reconnect);
+                        conn->reconnect = NULL;
                 }
                 pthread_mutex_unlock (&conn->lock);
                 rpc_clnt_unref (rpc);
-- 
1.8.3.1