andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd: Coverity issues with type FORWARD_NULL

Browse Source 
This patch fixes coverity issues 102, 103, 112 and 119 from [1]

[1] https://download.gluster.org/pub/gluster/glusterfs/static-analysis/master/glusterfs-coverity/2018-07-23-5fa004f3/html/

Updates: bz#789278

Change-Id: I99762eb0bcbd974a5250434777db63520f2ce2e6
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
This commit is contained in:
Sanju Rakonde 2018-07-24 14:27:02 +05:30 committed by Atin Mukherjee
parent 59401e705b
commit 8ad159b2a7
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xlators/mgmt/glusterd/src/glusterd-handshake.c
View File

@ -1828,9 +1828,10 @@ gd_validate_peer_op_version (xlator_t *this, glusterd_peerinfo_t *peerinfo,
ret = 0;
out:
gf_msg_debug ((this ? this->name : "glusterd") , 0, "Peer %s %s",
peerinfo->hostname, ((ret < 0) ? "rejected" : "accepted")
);
if (peerinfo)
gf_msg_debug ((this ? this->name : "glusterd") , 0, "Peer %s %s",
peerinfo->hostname,
((ret < 0) ? "rejected" : "accepted"));
return ret;
}

3
xlators/mgmt/glusterd/src/glusterd-store.c
View File

@ -4221,7 +4221,8 @@ out:
gf_store_handle_destroy (peerinfo->shandle);
peerinfo->shandle = NULL;
}
gf_msg_debug (this->name, 0, "Returning with %d", ret);
gf_msg_debug ((this ? this->name : "glusterd"), 0, "Returning with %d",
ret);
return ret;
}

10
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -5243,6 +5243,10 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count,
svc = &(priv->bitd_svc);
else if (strcmp(server, priv->scrub_svc.name) == 0)
svc = &(priv->scrub_svc);
else {
ret = 0;
goto out;
}
//Consider service to be running only when glusterd sees it Online
if (svc->online)
@ -5258,11 +5262,6 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count,
* when output.
*/
if (!strcmp(server, "")) {
ret = 0;
goto out;
}
snprintf (key, sizeof (key), "brick%d.hostname", count);
if (!strcmp (server, priv->nfs_svc.name))
ret = dict_set_str (dict, key, "NFS Server");
@ -5313,7 +5312,6 @@ glusterd_add_node_to_dict (char *server, dict_t *dict, int count,
if (ret)
goto out;
out:
gf_msg_debug (THIS->name, 0, "Returning %d", ret);
return ret;

2
xlators/mgmt/glusterd/src/glusterd-volume-ops.c
View File

@ -974,7 +974,7 @@ out:
if (op_errstr[0] == '\0')
snprintf (op_errstr, sizeof (op_errstr),
"operation failed");
gf_msg (this->name, GF_LOG_ERROR, 0,
gf_msg ((this ? this->name : "glusterd"), GF_LOG_ERROR, 0,
GD_MSG_GLUSTERD_OP_FAILED, "%s", op_errstr);
ret = glusterd_op_send_cli_response (cli_op, ret, 0, req,
dict, op_errstr);