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

glusterd: Coverity Fixes

Browse Source 
Fixes: #789278
Change-Id: I633704fab49992cac6ee9e05bc368f7da360d09e
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
This commit is contained in:
Sanju Rakonde 2018-06-02 01:38:10 +05:30 committed by Atin Mukherjee
parent e00d6ba4ad
commit 9647f0c64b
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xlators/mgmt/glusterd/src/glusterd-op-sm.c
View File

@ -5979,6 +5979,8 @@ glusterd_op_ac_commit_op (glusterd_op_sm_event_t *event, void *ctx)
gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_DICT_SET_FAILED,
"Failed to set transaction id.");
if (txn_op_info.skip_locking)
ret = glusterd_clear_txn_opinfo (txn_id);
GF_FREE (txn_id);
goto out;
}
@ -5995,7 +5997,7 @@ out:
/* for no volname transactions, the txn_opinfo needs to be cleaned up
* as there's no unlock event triggered
*/
if (txn_op_info.skip_locking)
if (txn_id && txn_op_info.skip_locking)
ret = glusterd_clear_txn_opinfo (txn_id);
gf_msg_debug (this->name, 0, "Returning with %d", ret);

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

@ -1254,8 +1254,9 @@ glusterd_brickinfo_new_from_brick (char *brick,
ret = gf_canonicalize_path (path);
if (ret)
goto out;
strncpy (new_brickinfo->hostname, hostname, 1024);
strncpy (new_brickinfo->path, path, 1024);
gf_strncpy (new_brickinfo->hostname, hostname,
sizeof(new_brickinfo->hostname));
gf_strncpy (new_brickinfo->path, path, sizeof(new_brickinfo->path));
if (construct_real_path) {
ret = glusterd_hostname_to_uuid (new_brickinfo->hostname,
@ -7489,7 +7490,7 @@ out:
}
if (*in_use) {
if (!strcmp (path, curdir)) {
if (path && curdir && !strcmp (path, curdir)) {
snprintf (msg, sizeof (msg), "%s is already part of a "
"volume", path);
} else {