From fa091f07841dac48fff1fa505b88f7b7edea9edc Mon Sep 17 00:00:00 2001 From: Iraj Jamali Date: Tue, 25 Sep 2018 16:45:48 +0530 Subject: mgmt/glusterd: NULL pointer deferencing clang fix Changed this->name to "glusterd" Updates: bz#1622665 Change-Id: Ic8ce428cefd6a5cecf5547769d8b13f530065c56 Signed-off-by: Iraj Jamali --- xlators/mgmt/glusterd/src/glusterd-bitd-svc.c | 2 +- xlators/mgmt/glusterd/src/glusterd-nfs-svc.c | 2 +- xlators/mgmt/glusterd/src/glusterd-quotad-svc.c | 2 +- xlators/mgmt/glusterd/src/glusterd-scrub-svc.c | 2 +- xlators/mgmt/glusterd/src/glusterd-shd-svc.c | 2 +- xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c index b01c2599df..c8e30a5682 100644 --- a/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-bitd-svc.c @@ -150,7 +150,7 @@ glusterd_bitdsvc_reconfigure() gf_boolean_t identical = _gf_false; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); priv = this->private; GF_VALIDATE_OR_GOTO(this->name, priv, out); diff --git a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c index c153719545..927743e012 100644 --- a/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-nfs-svc.c @@ -150,7 +150,7 @@ glusterd_nfssvc_reconfigure() glusterd_volinfo_t *volinfo = NULL; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); priv = this->private; GF_VALIDATE_OR_GOTO(this->name, priv, out); diff --git a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c index 538614bbad..d93240e230 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-quotad-svc.c @@ -157,7 +157,7 @@ glusterd_quotadsvc_reconfigure() gf_boolean_t identical = _gf_false; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); priv = this->private; GF_VALIDATE_OR_GOTO(this->name, priv, out); diff --git a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c index 3ae5b0e861..2c88a945bf 100644 --- a/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-scrub-svc.c @@ -147,7 +147,7 @@ glusterd_scrubsvc_reconfigure() gf_boolean_t identical = _gf_false; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); priv = this->private; GF_VALIDATE_OR_GOTO(this->name, priv, out); diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c index 548231a30f..606f591273 100644 --- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c @@ -197,7 +197,7 @@ glusterd_shdsvc_reconfigure() gf_boolean_t identical = _gf_false; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); priv = this->private; GF_VALIDATE_OR_GOTO(this->name, priv, out); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 758dafd0a1..9b9e6f88f0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -11004,7 +11004,7 @@ glusterd_volume_tier_use_rsp_dict(dict_t *aggr, dict_t *rsp_dict) char *task_id_str = NULL; this = THIS; - GF_VALIDATE_OR_GOTO(this->name, this, out); + GF_VALIDATE_OR_GOTO("glusterd", this, out); GF_VALIDATE_OR_GOTO(this->name, rsp_dict, out); if (aggr) { -- cgit