From 3a1484c401d4293531c80532fa96c2f7cfc8aa2d Mon Sep 17 00:00:00 2001
From: Sanju Rakonde <srakonde@redhat.com>
Date: Wed, 19 Sep 2018 19:49:51 +0530
Subject: [PATCH 458/493] glusterd: fix crash

When huge number of volumes are created, glusterd crash is seen.
With the core dump, got to know that mgmt_lock_timer became NULL.
Adding a null check for the same, need to explore about the root
cause.

>updates: bz#1630922
>Change-Id: I0770063fcbbbf4b24bef29e94b857b20bdfb5b85
>Signed-off-by: Sanju Rakonde <srakonde@redhat.com>

upstream patch: https://review.gluster.org/#/c/glusterfs/+/21228/

Change-Id: I0770063fcbbbf4b24bef29e94b857b20bdfb5b85
BUG: 1599220
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/158542
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
 xlators/mgmt/glusterd/src/glusterd-locks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-locks.c b/xlators/mgmt/glusterd/src/glusterd-locks.c
index d75452d..d62d9dd 100644
--- a/xlators/mgmt/glusterd/src/glusterd-locks.c
+++ b/xlators/mgmt/glusterd/src/glusterd-locks.c
@@ -890,7 +890,7 @@ glusterd_mgmt_v3_unlock (const char *name, uuid_t uuid, char *type)
                 type, name);
 
         /* Release owner reference which was held during lock */
-        if (mgmt_lock_timer->timer) {
+        if (mgmt_lock_timer && mgmt_lock_timer->timer) {
                 ret = -1;
                 mgmt_lock_timer_xl = mgmt_lock_timer->xl;
                 GF_VALIDATE_OR_GOTO (this->name, mgmt_lock_timer_xl, out);
-- 
1.8.3.1