path: root/xlators/mgmt/glusterd/src/glusterd.h
diff options
authorKaushal M <>2015-01-06 15:12:59 +0530
committerKrishnan Parthasarathi <>2015-02-23 04:35:37 -0800
commit30357bcfcd4a7c92e0e59ff58a26d48c8416c564 (patch)
tree4bd795031072a87eaf2ffe0e979c44f16cccf9be /xlators/mgmt/glusterd/src/glusterd.h
parenta671b9a575b89c263af161293e78e49484859ec7 (diff)
build, glusterd: Add liburcu to build system
This patch adds liburcu related checks to the build system and updates the spec file to require 'userspace-rcu'. liburcu >= 0.7 is required to build GlusterFS, but 0.8 and above is preferred. For cases when liburcu 0.7.x is the available version, some function definitions (currently just one) from liburcu-0.8.6 have been made available in /contrib/userspace-rcu/. This change was developed on the git branch at [1]. This commit is a combination of the following commits on the development branch. a5cd6bd Add userspace-rcu checks to fe5ced3 Add URCU libs to glusterd libtool flags 1e43302 Add local definition of cds_list_add_tail_rcu for liburcu-0.7 98da755 Move local definition of cds_list_add_tail_rcu into contrib 8c44dfd Update spec file to include userspace-rcu0466e33 Rename rculist-additional.h to rculist-extra.h 947c7b3 Add rculist-extra.h to dist 19f32ad Address review comments 9605/1 [1]: Change-Id: Ifbb617d0dacce8fa01214f894badb9d8cdcaf56f BUG: 1191030 Signed-off-by: Kaushal M <> Reviewed-on: Tested-by: Gluster Build System <> Reviewed-by: Atin Mukherjee <> Reviewed-by: Niels de Vos <> Reviewed-by: Krishnan Parthasarathi <> Tested-by: Krishnan Parthasarathi <>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.h')
1 files changed, 7 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index 298551c2d9e..941a587d175 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -20,6 +20,12 @@
#include <pthread.h>
#include <libgen.h>
+#include <urcu-bp.h>
+#include <urcu/rculist.h>
+#ifdef URCU_0_7
+#include "rculist-extra.h"
#include "uuid.h"
#include "rpc-clnt.h"
@@ -1057,4 +1063,5 @@ glusterd_add_brick_status_to_dict (dict_t *dict, glusterd_volinfo_t *volinfo,
glusterd_handle_snap_limit (dict_t *dict, dict_t *rsp_dict);