path: root/xlators/features/upcall/src
diff options
authorEmmanuel Dreyfus <>2015-04-02 15:51:30 +0200
committerVijay Bellur <>2015-04-04 10:48:35 -0700
commit28397cae4102ac3f08576ebaf071ad92683097e8 (patch)
tree4c8be92299a951c8a28e1dc85bf2671f60da6e08 /xlators/features/upcall/src
parent0aebfaa349c7c68c2d59531eabae5a03a748e16a (diff)
Avoid conflict between contrib/uuid and system uuid
glusterfs relies on Linux uuid implementation, which API is incompatible with most other systems's uuid. As a result, libglusterfs has to embed contrib/uuid, which is the Linux implementation, on non Linux systems. This implementation is incompatible with systtem's built in, but the symbols have the same names. Usually this is not a problem because when we link with -lglusterfs, libc's symbols are trumped. However there is a problem when a program not linked with -lglusterfs will dlopen() glusterfs component. In such a case, libc's uuid implementation is already loaded in the calling program, and it will be used instead of libglusterfs's implementation, causing crashes. A possible workaround is to use pre-load libglusterfs in the calling program (using LD_PRELOAD on NetBSD for instance), but such a mechanism is not portable, nor is it flexible. A much better approach is to rename libglusterfs's uuid_* functions to gf_uuid_* to avoid any possible conflict. This is what this change attempts. BUG: 1206587 Change-Id: I9ccd3e13afed1c7fc18508e92c7beb0f5d49f31a Signed-off-by: Emmanuel Dreyfus <> Reviewed-on: Tested-by: Gluster Build System <> Reviewed-by: Niels de Vos <>
Diffstat (limited to 'xlators/features/upcall/src')
2 files changed, 2 insertions, 2 deletions
diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c
index ef7743c9083..29c387601f9 100644
--- a/xlators/features/upcall/src/upcall-internal.c
+++ b/xlators/features/upcall/src/upcall-internal.c
@@ -421,7 +421,7 @@ upcall_client_cache_invalidate (xlator_t *this, uuid_t gfid,
if (t_expired < timeout) {
/* Send notify call */
- uuid_copy(n_event_data.gfid, gfid);
+ gf_uuid_copy(n_event_data.gfid, gfid);
n_event_data.client_entry = up_client_entry;
n_event_data.event_type = CACHE_INVALIDATION;
n_event_data.invalidate_flags = flags;
diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c
index 45114b5f29f..93861e7955f 100644
--- a/xlators/features/upcall/src/upcall.c
+++ b/xlators/features/upcall/src/upcall.c
@@ -405,7 +405,7 @@ up_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
CACHE_INVALIDATE_DIR (frame, this, client, local->inode, flags);
/* XXX: notify oldparent as well */
-/* if (uuid_compare (preoldparent->ia_gfid, prenewparent->ia_gfid))
+/* if (gf_uuid_compare (preoldparent->ia_gfid, prenewparent->ia_gfid))
CACHE_INVALIDATE (frame, this, client, prenewparent->ia_gfid, flags);*/