diff options
| author | Varsha Rao <varao@redhat.com> | 2018-04-13 16:16:43 +0530 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2018-05-03 05:03:26 +0000 |
| commit | 11b747bcec316aad77c68451346e092f33b2f218 (patch) | |
| tree | 9d49231b7777862a47e9b9ac33325ce286be608d /xlators/mgmt/glusterd/src/glusterd-geo-rep.c | |
| parent | 4e7b423d3c3137c3f83b71b36279e1a544154833 (diff) | |
glusterd/geo-rep: Fix UNUSED_VALUE coverity issue
The return value of glusterd_get_local_brickpaths is unused so add
goto statement. As it is reinitialized outside the if block. Also
change the if condition to check the failure case, when return value
is -1 and path_list is NULL.
Change-Id: I6b47d7751263f704bd69a6452a7e71bfcf226d49
updates: bz#789278
Signed-off-by: Varsha Rao <varao@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-geo-rep.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index a7b56617df0..25193e2a51f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -3648,8 +3648,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) - ret = -1; + if (!path_list && ret == -1) + goto out; } /* Check for geo-rep session is active or not for @@ -3681,10 +3681,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) { - ret = -1; + if (!path_list && ret == -1) goto out; - } } /* Check for geo-rep session is active or not @@ -3704,10 +3702,8 @@ glusterd_op_stage_gsync_set (dict_t *dict, char **op_errstr) if (ret) { ret = glusterd_get_local_brickpaths (volinfo, &path_list); - if (path_list) { - ret = -1; + if (!path_list && ret == -1) goto out; - } } } break; @@ -5570,6 +5566,8 @@ glusterd_op_gsync_set (dict_t *dict, char **op_errstr, dict_t *rsp_dict) } ret = glusterd_get_local_brickpaths (volinfo, &path_list); + if (!path_list && ret == -1) + goto out; } if (type == GF_GSYNC_OPTION_TYPE_CONFIG) { |