summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-log-ops.c5
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-svc-helper.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c
index 5e0877e836c..a48923e26e1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c
@@ -226,8 +226,9 @@ cont:
if (gf_uuid_compare(brickinfo->uuid, MY_UUID))
continue;
- if (brick && (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) ||
- strcmp(tmpbrkinfo->path, brickinfo->path)))
+ if (tmpbrkinfo && brick &&
+ (strcmp(tmpbrkinfo->hostname, brickinfo->hostname) ||
+ strcmp(tmpbrkinfo->path, brickinfo->path)))
continue;
valid_brick = 1;
diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
index 70cc539b510..cde77e5f6af 100644
--- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
+++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
@@ -294,7 +294,7 @@ glusterd_volume_svc_check_volfile_identical(
this = THIS;
- GF_VALIDATE_OR_GOTO(this->name, this, out);
+ GF_VALIDATE_OR_GOTO("glusterd", this, out);
GF_VALIDATE_OR_GOTO(this->name, identical, out);
/* This builds volfile for volume level dameons */