|
 |
14f8ab |
From 9425fd5a49a17a8f91c13632ae055a6510b0b44c Mon Sep 17 00:00:00 2001
|
|
|
14f8ab |
From: Sanju Rakonde <srakonde@redhat.com>
|
|
|
14f8ab |
Date: Fri, 17 May 2019 14:27:58 +0530
|
|
|
14f8ab |
Subject: [PATCH 435/449] glusterd: coverity fix
|
|
|
14f8ab |
|
|
|
14f8ab |
CID: 1401345 - Unused value
|
|
|
14f8ab |
|
|
|
14f8ab |
> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22737/
|
|
|
14f8ab |
> updates: bz#789278
|
|
|
14f8ab |
> Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3
|
|
|
14f8ab |
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
14f8ab |
|
|
|
14f8ab |
BUG: 1787310
|
|
|
14f8ab |
Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3
|
|
|
14f8ab |
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
14f8ab |
Reviewed-on: https://code.engineering.redhat.com/gerrit/202622
|
|
|
14f8ab |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
14f8ab |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
14f8ab |
---
|
|
|
14f8ab |
xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +-
|
|
|
14f8ab |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
14f8ab |
|
|
|
14f8ab |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
14f8ab |
index 8b0fc9a..2eb2a76 100644
|
|
|
14f8ab |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
14f8ab |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
14f8ab |
@@ -3740,7 +3740,7 @@ glusterd_compare_friend_volume(dict_t *peer_data, int32_t count,
|
|
|
14f8ab |
* deleting a volume, so we shouldn't be trying to create a
|
|
|
14f8ab |
* fresh volume here which would lead to a stale entry
|
|
|
14f8ab |
*/
|
|
|
14f8ab |
- if (stage_deleted == 0)
|
|
|
14f8ab |
+ if (!ret && stage_deleted == 0)
|
|
|
14f8ab |
*status = GLUSTERD_VOL_COMP_UPDATE_REQ;
|
|
|
14f8ab |
ret = 0;
|
|
|
14f8ab |
goto out;
|
|
|
14f8ab |
--
|
|
|
14f8ab |
1.8.3.1
|
|
|
14f8ab |
|