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>

2 files changed, 7 insertions, 7 deletions

diff --git a/xlators/storage/bd/src/bd-helper.c b/xlators/storage/bd/src/bd-helper.c
index 5ca1ef79400..8aaffa6b27a 100644
--- a/xlators/storage/bd/src/bd-helper.c
+++ b/xlators/storage/bd/src/bd-helper.c
@@ -138,7 +138,7 @@ check:
                 goto out;
         }
 
-        op_ret = uuid_parse (tmp_data->data, dict_uuid);
+        op_ret = gf_uuid_parse (tmp_data->data, dict_uuid);
         if (op_ret < 0) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "wrong volume-id (%s) set in volume file",
@@ -171,7 +171,7 @@ check:
                 goto out;
         }
 
-        op_ret = uuid_parse (strl->str + strlen (GF_XATTR_VOL_ID_KEY) + 1,
+        op_ret = gf_uuid_parse (strl->str + strlen (GF_XATTR_VOL_ID_KEY) + 1,
                              vg_uuid);
         if (op_ret < 0) {
                         gf_log (this->name, GF_LOG_ERROR,
@@ -179,7 +179,7 @@ check:
                         op_ret = -1;
                         goto out;
         }
-        if (uuid_compare (dict_uuid, vg_uuid)) {
+        if (gf_uuid_compare (dict_uuid, vg_uuid)) {
                 gf_log (this->name, GF_LOG_ERROR,
                         "mismatching volume-id (%s) received. "
                         "already is a part of volume %s ",
diff --git a/xlators/storage/bd/src/bd.c b/xlators/storage/bd/src/bd.c
index 85372f072ed..4ef94810f99 100644
--- a/xlators/storage/bd/src/bd.c
+++ b/xlators/storage/bd/src/bd.c
@@ -796,7 +796,7 @@ bd_fsync (call_frame_t *frame, xlator_t *this,
                 local->bdatt->type = gf_strdup (bdatt->type);
                 memcpy (&local->bdatt->iatt, &bdatt->iatt, sizeof (struct iatt));
                 bd_update_amtime (&local->bdatt->iatt, valid);
-                uuid_copy (local->loc.gfid, fd->inode->gfid);
+                gf_uuid_copy (local->loc.gfid, fd->inode->gfid);
                 STACK_WIND (frame, bd_fsync_setattr_cbk, FIRST_CHILD (this),
                             FIRST_CHILD (this)->fops->setattr, &local->loc,
                             &local->bdatt->iatt,
@@ -853,7 +853,7 @@ bd_flush (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
         BD_VALIDATE_MEM_ALLOC (local, op_errno, out);
 
         local->fd = fd_ref (fd);
-        uuid_copy (loc.gfid, bdatt->iatt.ia_gfid);
+        gf_uuid_copy (loc.gfid, bdatt->iatt.ia_gfid);
 
         /* Update the a|mtime during flush */
         STACK_WIND (frame, bd_flush_setattr_cbk, FIRST_CHILD (this),
@@ -1269,7 +1269,7 @@ bd_do_merge(call_frame_t *frame, xlator_t *this)
                 op_errno = EINVAL;
                 goto out;
         }
-        uuid_copy (local->loc.pargfid, parent->gfid);
+        gf_uuid_copy (local->loc.pargfid, parent->gfid);
 
         p = strrchr (local->loc.path, '/');
         if (p)
@@ -1327,7 +1327,7 @@ bd_offload (call_frame_t *frame, xlator_t *this, loc_t *loc,
                 goto out;
         }
 
-        uuid_parse (gfid, local->dloc->gfid);
+        gf_uuid_parse (gfid, local->dloc->gfid);
         local->offload = offload;
 
         STACK_WIND (frame, bd_offload_dest_lookup_cbk, FIRST_CHILD (this),