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>

3 files changed, 9 insertions, 9 deletions

diff --git a/xlators/features/changelog/src/changelog-helpers.c b/xlators/features/changelog/src/changelog-helpers.c
index 5c755d76d69..ca326043acc 100644
--- a/xlators/features/changelog/src/changelog-helpers.c
+++ b/xlators/features/changelog/src/changelog-helpers.c
@@ -796,7 +796,7 @@ changelog_local_init (xlator_t *this, inode_t *inode,
 
         local->update_no_check = update_flag;
 
-        uuid_copy (local->cld.cld_gfid, gfid);
+        gf_uuid_copy (local->cld.cld_gfid, gfid);
 
         local->cld.cld_iobuf = iobuf;
         local->cld.cld_xtra_records = 0; /* set by the caller */
diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h
index aca2e706e0c..765d5fd878b 100644
--- a/xlators/features/changelog/src/changelog-helpers.h
+++ b/xlators/features/changelog/src/changelog-helpers.h
@@ -557,7 +557,7 @@ __changelog_inode_ctx_get (xlator_t *, inode_t *, unsigned long **,
                 co->co_convert = converter;                             \
                 co->co_free = freefn;                                   \
                 co->co_type = CHANGELOG_OPT_REC_ENTRY;                  \
-                uuid_copy (co->co_entry.cef_uuid, pargfid);             \
+                gf_uuid_copy (co->co_entry.cef_uuid, pargfid);          \
                 co->co_entry.cef_bname = gf_strdup(bname);              \
                 if (!co->co_entry.cef_bname)                            \
                         goto label;                                     \
diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c
index 1c7166e52b5..e6553c7f6bb 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -575,7 +575,7 @@ changelog_mkdir (call_frame_t *frame, xlator_t *this,
                         "failed to get gfid from dict");
                 goto wind;
         }
-        uuid_copy (gfid, uuid_req);
+        gf_uuid_copy (gfid, uuid_req);
 
         CHANGELOG_INIT_NOCHECK (this, frame->local, NULL, gfid, 5);
 
@@ -711,7 +711,7 @@ changelog_symlink (call_frame_t *frame, xlator_t *this,
                         "failed to get gfid from dict");
                 goto wind;
         }
-        uuid_copy (gfid, uuid_req);
+        gf_uuid_copy (gfid, uuid_req);
 
         CHANGELOG_INIT_NOCHECK (this, frame->local, NULL, gfid, 2);
 
@@ -839,7 +839,7 @@ changelog_mknod (call_frame_t *frame,
                         "failed to get gfid from dict");
                 goto wind;
         }
-        uuid_copy (gfid, uuid_req);
+        gf_uuid_copy (gfid, uuid_req);
 
         CHANGELOG_INIT_NOCHECK (this, frame->local, NULL, gfid, 5);
 
@@ -923,7 +923,7 @@ changelog_create_cbk (call_frame_t *frame,
 
         /* fill the event structure.. similar to open() */
         ev.ev_type = CHANGELOG_OP_TYPE_CREATE;
-        uuid_copy (ev.u.create.gfid, buf->ia_gfid);
+        gf_uuid_copy (ev.u.create.gfid, buf->ia_gfid);
         ev.u.create.flags = fd->flags;
         changelog_dispatch_event (this, priv, &ev);
 
@@ -993,7 +993,7 @@ changelog_create (call_frame_t *frame, xlator_t *this,
                         "failed to get gfid from dict");
                 goto wind;
         }
-        uuid_copy (gfid, uuid_req);
+        gf_uuid_copy (gfid, uuid_req);
 
         /* init with two extra records */
         CHANGELOG_INIT_NOCHECK (this, frame->local, NULL, gfid, 5);
@@ -1676,7 +1676,7 @@ changelog_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
         /* fill the event structure */
         ev.ev_type = CHANGELOG_OP_TYPE_OPEN;
-        uuid_copy (ev.u.open.gfid, fd->inode->gfid);
+        gf_uuid_copy (ev.u.open.gfid, fd->inode->gfid);
         ev.u.open.flags = fd->flags;
         changelog_dispatch_event (this, priv, &ev);
 
@@ -1768,7 +1768,7 @@ changelog_release (xlator_t *this, fd_t *fd)
         priv = this->private;
 
         ev.ev_type = CHANGELOG_OP_TYPE_RELEASE;
-        uuid_copy (ev.u.release.gfid, fd->inode->gfid);
+        gf_uuid_copy (ev.u.release.gfid, fd->inode->gfid);
         changelog_dispatch_event (this, priv, &ev);
 
         (void) fd_ctx_del (fd, this, NULL);