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 <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10017
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/xlators/features/bit-rot/src/stub/bit-rot-stub.c b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
index 0a2be5f6b42..1a268e16b93 100644
--- a/xlators/features/bit-rot/src/stub/bit-rot-stub.c
+++ b/xlators/features/bit-rot/src/stub/bit-rot-stub.c
@@ -282,7 +282,7 @@ br_stub_fill_local (br_stub_local_t *local,
                 local->u.context.fd = fd_ref (fd);
         if (inode)
                 local->u.context.inode = inode_ref (inode);
-        uuid_copy (local->u.context.gfid, gfid);
+        gf_uuid_copy (local->u.context.gfid, gfid);
 
         /* mark inode dirty/fresh according to durability */
         local->u.context.markdirty = (dirty) ? _gf_true : _gf_false;
@@ -799,8 +799,8 @@ br_stub_getxattr (call_frame_t *frame, xlator_t *this,
         if (name
             && (strncmp (name, GLUSTERFS_GET_BR_STUB_INIT_TIME,
                           strlen (GLUSTERFS_GET_BR_STUB_INIT_TIME)) == 0)
-            && ((uuid_compare (loc->gfid, rootgfid) == 0)
-                || (uuid_compare (loc->inode->gfid, rootgfid) == 0))) {
+            && ((gf_uuid_compare (loc->gfid, rootgfid) == 0)
+                || (gf_uuid_compare (loc->inode->gfid, rootgfid) == 0))) {
                 br_stub_send_stub_init_time (frame, this);
                 return 0;
         }
@@ -844,7 +844,7 @@ br_stub_fgetxattr (call_frame_t *frame, xlator_t *this,
         if (name
             && (strncmp (name, GLUSTERFS_GET_BR_STUB_INIT_TIME,
                          strlen (GLUSTERFS_GET_BR_STUB_INIT_TIME)) == 0)
-            && (uuid_compare (fd->inode->gfid, rootgfid) == 0)) {
+            && (gf_uuid_compare (fd->inode->gfid, rootgfid) == 0)) {
                 br_stub_send_stub_init_time (frame, this);
                 return 0;
         }
@@ -1269,7 +1269,7 @@ br_stub_send_ipc_fop (xlator_t *this,
         ev.ev_type = CHANGELOG_OP_TYPE_BR_RELEASE;
         ev.u.releasebr.flags = flags;
         ev.u.releasebr.version = releaseversion;
-        uuid_copy (ev.u.releasebr.gfid, fd->inode->gfid);
+        gf_uuid_copy (ev.u.releasebr.gfid, fd->inode->gfid);
 
         xdata = dict_new ();
         if (!xdata) {