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, 4 insertions, 4 deletions

diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c
index 6b899414d4d..c4b896a5fb3 100644
--- a/xlators/cluster/ec/src/ec-heald.c
+++ b/xlators/cluster/ec/src/ec-heald.c
@@ -144,7 +144,7 @@ ec_shd_inode_find (xlator_t *this, xlator_t *subvol, uuid_t gfid)
         loc.inode = inode_new (this->itable);
         if (!loc.inode)
                 goto out;
-        uuid_copy (loc.gfid, gfid);
+        gf_uuid_copy (loc.gfid, gfid);
 
         ret = syncop_lookup (subvol, &loc, NULL, &iatt, NULL, NULL);
         if (ret < 0)
@@ -169,7 +169,7 @@ ec_shd_index_inode (xlator_t *this, xlator_t *subvol)
         void    *index_gfid = NULL;
 
         rootloc.inode = inode_ref (this->itable->root);
-        uuid_copy (rootloc.gfid, rootloc.inode->gfid);
+        gf_uuid_copy (rootloc.gfid, rootloc.inode->gfid);
 
         ret = syncop_getxattr (subvol, &rootloc, &xattr,
                                GF_XATTROP_INDEX_GFID, NULL);
@@ -234,7 +234,7 @@ ec_shd_index_heal (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
         gf_log (healer->this->name, GF_LOG_DEBUG, "got entry: %s",
                 entry->d_name);
 
-        ret = uuid_parse (entry->d_name, loc.gfid);
+        ret = gf_uuid_parse (entry->d_name, loc.gfid);
         if (ret)
                 return 0;
 
@@ -301,7 +301,7 @@ ec_shd_full_heal (xlator_t *subvol, gf_dirent_t *entry, loc_t *parent,
 
         loc.parent = inode_ref (parent->inode);
         loc.name   = entry->d_name;
-        uuid_copy (loc.gfid, entry->d_stat.ia_gfid);
+        gf_uuid_copy (loc.gfid, entry->d_stat.ia_gfid);
 
         /* If this fails with ENOENT/ESTALE index is stale */
         ret = syncop_gfid_to_path (this->itable, subvol, loc.gfid,