summaryrefslogtreecommitdiffstats
path: root/xlators/encryption/crypt/src/crypt.h
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2015-04-02 00:29:59 +0530
committerVijay Bellur <vbellur@redhat.com>2015-04-02 03:10:25 -0700
commit12e603bb9d8bc220eeea01c0ecc8ca63f9df4bc4 (patch)
treeaceecaef9e9217862e47cf955b3e93eacc2c9e15 /xlators/encryption/crypt/src/crypt.h
parent10b4ecb85c5009c6c7b9422bd5299ba43d8448a1 (diff)
glusterd: Fix rebase errors introduced by 4b18fba
4b18fba 'glusterd: group server-quorum related code together' a refactoring change, introduced some errors related to usage of userspace-rcu lists when rebasing. This patch fixes it. Changes done include, - Redo changes done by 673ba26 glusterd: Replace libglusterfs lists with liburcu lists - Redo changes done by c7785f7 glusterd: Protect the peer list and peerinfos with RCU. - Redo changes done by 891c7d0 glusterd: Prevent possible deadlock due to glusterd_quorum_count Change-Id: I789e5bc8b209d9ed6dd951d609baa90e89817639 BUG: 1205592 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/10105 Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/encryption/crypt/src/crypt.h')
0 files changed, 0 insertions, 0 deletions