5 files changed, 8 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
index 927743e0122..9bc46a9bb63 100644
--- a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
+++ b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c
@@ -220,6 +220,6 @@ glusterd_nfssvc_reconfigure()
     ret = priv->nfs_svc.manager(&(priv->nfs_svc), NULL, PROC_START_NO_WAIT);
 
 out:
-    gf_msg_debug(this->name, 0, "Returning %d", ret);
+    gf_msg_debug(this ? this->name : "glusterd", 0, "Returning %d", ret);
     return ret;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index ca09d5afe20..c8343fb0a2d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -1216,7 +1216,7 @@ glusterd_op_stage_set_volume(dict_t *dict, char **op_errstr)
              */
             if ((dict_getn(dict, "is-special-key", SLEN("is-special-key")) ==
                  NULL) &&
-                (volinfo->status != GLUSTERD_STATUS_NONE)) {
+                volinfo && (volinfo->status != GLUSTERD_STATUS_NONE)) {
                 snprintf(errstr, sizeof(errstr),
                          " 'gluster "
                          "volume set <VOLNAME> %s {enable, "
diff --git a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c
index 2c88a945bfe..f7c23ce57c3 100644
--- a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c
+++ b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c
@@ -200,6 +200,6 @@ manager:
     ret = priv->scrub_svc.manager(&(priv->scrub_svc), NULL, PROC_START_NO_WAIT);
 
 out:
-    gf_msg_debug(this->name, 0, "Returning %d", ret);
+    gf_msg_debug(this ? this->name : "glusterd", 0, "Returning %d", ret);
     return ret;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
index 606f5912733..a096649fb44 100644
--- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
+++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
@@ -249,6 +249,6 @@ manager:
     ret = priv->shd_svc.manager(&(priv->shd_svc), NULL, PROC_START_NO_WAIT);
 
 out:
-    gf_msg_debug(this->name, 0, "Returning %d", ret);
+    gf_msg_debug(this ? this->name : "glusterd", 0, "Returning %d", ret);
     return ret;
 }
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 3e291e046e3..13b289fdcb8 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3383,12 +3383,12 @@ volgen_link_bricks(volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
         if ((i % sub_count) == 0) {
             xl = volgen_graph_add_nolink(graph, xl_type, xl_namefmt, volname,
                                          j);
-            if (!xl) {
-                ret = -1;
-                goto out;
-            }
             j++;
         }
+        if (!xl) {
+            ret = -1;
+            goto out;
+        }
 
         ret = volgen_xlator_link(xl, trav);
         if (ret)