diff options
| author | sanoj-unnikrishnan <sunnikri@redhat.com> | 2018-08-29 14:45:50 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-09-07 03:42:18 +0000 |
| commit | c8100dfe65e04cf818b7535fbec658667b9d5dbb (patch) | |
| tree | 43b720423d0972a7cbaf317053e037f204906cc7 /xlators | |
| parent | f6a7f6e8124327509559170faa9a4dce6fad9731 (diff) | |
Quota: Fix for clang issues
Updates: bz#1193929
Change-Id: I549f741fbf97ee3fa2d63edacee5b705ef37c49a
Signed-off-by: sanoj-unnikrishnan <sunnikri@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/marker/src/marker-quota-helper.c | 3 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 6 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-quotad-svc.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c index 92d4094e7f8..1fbadcfe9d3 100644 --- a/xlators/features/marker/src/marker-quota-helper.c +++ b/xlators/features/marker/src/marker-quota-helper.c @@ -305,7 +305,8 @@ mq_dict_set_contribution (xlator_t *this, dict_t *dict, loc_t *loc, out: if (ret < 0) - gf_log_callingfn (this->name, GF_LOG_ERROR, "dict set failed"); + gf_log_callingfn (this ? this->name : "Marker", + GF_LOG_ERROR, "dict set failed"); return ret; } diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 6d3c5eaec23..8c8bfe0255a 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1446,7 +1446,7 @@ out: call_resume (stub); if (ret) - gf_log_callingfn (this->name, GF_LOG_ERROR, + gf_log_callingfn (this ? this->name : "Marker", GF_LOG_ERROR, "mq_reduce_parent_size_txn failed"); return ret; @@ -2183,8 +2183,8 @@ mq_req_xattr (xlator_t *this, loc_t *loc, dict_t *dict, out: if (ret < 0) - gf_log_callingfn (this->name, GF_LOG_ERROR, "dict set failed"); - + gf_log_callingfn (this ? this->name : "Marker", + GF_LOG_ERROR, "dict set failed"); return ret; } diff --git a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c index 5e2bd4c9672..827b2c62ccb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c @@ -213,6 +213,6 @@ manager: PROC_START_NO_WAIT); out: - gf_msg_debug (this->name, 0, "Returning %d", ret); + gf_msg_debug (this ? this->name : "Quotad", 0, "Returning %d", ret); return ret; } |