14e44be7b0
Resolves: bz#1234220 bz#1286171 bz#1487177 bz#1524457 bz#1640573 Resolves: bz#1663557 bz#1667954 bz#1683602 bz#1686897 bz#1721355 Resolves: bz#1748865 bz#1750211 bz#1754391 bz#1759875 bz#1761531 Resolves: bz#1761932 bz#1763124 bz#1763129 bz#1764091 bz#1775637 Resolves: bz#1776901 bz#1781550 bz#1781649 bz#1781710 bz#1783232 Resolves: bz#1784211 bz#1784415 bz#1786516 bz#1786681 bz#1787294 Resolves: bz#1787310 bz#1787331 bz#1787994 bz#1790336 bz#1792873 Resolves: bz#1794663 bz#1796814 bz#1804164 bz#1810924 bz#1815434 Resolves: bz#1836099 bz#1837467 bz#1837926 bz#1838479 bz#1839137 Resolves: bz#1844359 Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 9425fd5a49a17a8f91c13632ae055a6510b0b44c Mon Sep 17 00:00:00 2001
|
|
From: Sanju Rakonde <srakonde@redhat.com>
|
|
Date: Fri, 17 May 2019 14:27:58 +0530
|
|
Subject: [PATCH 435/449] glusterd: coverity fix
|
|
|
|
CID: 1401345 - Unused value
|
|
|
|
> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22737/
|
|
> updates: bz#789278
|
|
> Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3
|
|
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
|
BUG: 1787310
|
|
Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3
|
|
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/202622
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
index 8b0fc9a..2eb2a76 100644
|
|
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
@@ -3740,7 +3740,7 @@ glusterd_compare_friend_volume(dict_t *peer_data, int32_t count,
|
|
* deleting a volume, so we shouldn't be trying to create a
|
|
* fresh volume here which would lead to a stale entry
|
|
*/
|
|
- if (stage_deleted == 0)
|
|
+ if (!ret && stage_deleted == 0)
|
|
*status = GLUSTERD_VOL_COMP_UPDATE_REQ;
|
|
ret = 0;
|
|
goto out;
|
|
--
|
|
1.8.3.1
|
|
|